From 7074a63f953feb86f6371b2e3d360828461c4f23 Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Thu, 31 Aug 2023 04:35:04 -0400 Subject: [PATCH 01/40] Updated existing spawn files. Added preset for Flowers and Gemstones. Removed preset for Underground. Updated Natural preset. --- .../spawn_detail_presets/flowers.json | 8 ++ .../spawn_detail_presets/gemstones.json | 18 +++ .../spawn_detail_presets/natural.json | 4 + .../spawn_detail_presets/underground.json | 103 ------------------ .../spawn_pool_world/0009_blastoise.json | 4 +- .../spawn_pool_world/0010_caterpie.json | 9 +- .../spawn_pool_world/0011_metapod.json | 9 +- .../spawn_pool_world/0012_butterfree.json | 28 ++++- .../spawn_pool_world/0013_weedle.json | 2 +- .../spawn_pool_world/0014_kakuna.json | 2 +- .../spawn_pool_world/0015_beedrill.json | 2 +- .../spawn_pool_world/0016_pidgey.json | 6 +- .../spawn_pool_world/0017_pidgeotto.json | 4 +- .../spawn_pool_world/0018_pidgeot.json | 4 +- .../spawn_pool_world/0019_rattata.json | 18 +-- .../spawn_pool_world/0020_raticate.json | 4 +- .../spawn_pool_world/0021_spearow.json | 6 +- .../spawn_pool_world/0022_fearow.json | 4 +- .../spawn_pool_world/0023_ekans.json | 14 +-- .../spawn_pool_world/0025_pikachu.json | 5 +- .../spawn_pool_world/0026_raichu.json | 5 +- .../spawn_pool_world/0027_sandshrew.json | 2 +- .../spawn_pool_world/0029_nidoranf.json | 5 +- .../spawn_pool_world/0030_nidorina.json | 5 +- .../spawn_pool_world/0031_nidoqueen.json | 5 +- .../spawn_pool_world/0032_nidoranm.json | 5 +- .../spawn_pool_world/0033_nidorino.json | 5 +- .../spawn_pool_world/0034_nidoking.json | 5 +- .../spawn_pool_world/0035_clefairy.json | 10 +- .../spawn_pool_world/0036_clefable.json | 10 +- .../spawn_pool_world/0037_vulpix.json | 11 +- .../spawn_pool_world/0038_ninetales.json | 11 +- .../spawn_pool_world/0039_jigglypuff.json | 4 +- .../spawn_pool_world/0040_wigglytuff.json | 4 +- .../spawn_pool_world/0041_zubat.json | 2 +- .../spawn_pool_world/0042_golbat.json | 2 +- .../spawn_pool_world/0043_oddish.json | 23 ++-- .../spawn_pool_world/0044_gloom.json | 23 ++-- .../spawn_pool_world/0045_vileplume.json | 14 +-- .../spawn_pool_world/0046_paras.json | 4 +- .../spawn_pool_world/0047_parasect.json | 4 +- .../spawn_pool_world/0048_venonat.json | 2 +- .../spawn_pool_world/0050_diglett.json | 4 +- .../spawn_pool_world/0051_dugtrio.json | 4 +- .../spawn_pool_world/0052_meowth.json | 2 +- .../spawn_pool_world/0054_psyduck.json | 4 +- .../spawn_pool_world/0056_mankey.json | 2 +- .../spawn_pool_world/0057_primeape.json | 2 +- .../spawn_pool_world/0058_growlithe.json | 5 +- .../spawn_pool_world/0059_arcanine.json | 9 +- .../spawn_pool_world/0060_poliwag.json | 40 ++++++- .../spawn_pool_world/0061_poliwhirl.json | 40 ++++++- .../spawn_pool_world/0062_poliwrath.json | 40 ++++++- .../cobblemon/spawn_pool_world/0063_abra.json | 2 +- .../spawn_pool_world/0065_alakazam.json | 2 +- .../spawn_pool_world/0066_machop.json | 5 +- .../spawn_pool_world/0067_machoke.json | 5 +- .../spawn_pool_world/0068_machamp.json | 5 +- .../spawn_pool_world/0069_bellsprout.json | 2 +- .../spawn_pool_world/0071_victreebel.json | 2 +- .../spawn_pool_world/0072_tentacool.json | 13 ++- .../spawn_pool_world/0073_tentacruel.json | 13 ++- .../spawn_pool_world/0074_geodude.json | 6 +- .../spawn_pool_world/0075_graveler.json | 2 +- .../spawn_pool_world/0076_golem.json | 6 +- .../spawn_pool_world/0077_ponyta.json | 5 +- .../spawn_pool_world/0078_rapidash.json | 1 - .../spawn_pool_world/0079_slowpoke.json | 2 +- .../spawn_pool_world/0081_magnemite.json | 6 +- .../spawn_pool_world/0082_magneton.json | 6 +- .../spawn_pool_world/0083_farfetchd.json | 8 +- .../spawn_pool_world/0084_doduo.json | 5 +- .../spawn_pool_world/0085_dodrio.json | 3 +- .../cobblemon/spawn_pool_world/0086_seel.json | 4 +- .../spawn_pool_world/0087_dewgong.json | 4 +- .../spawn_pool_world/0088_grimer.json | 2 +- .../spawn_pool_world/0090_shellder.json | 25 ++++- .../spawn_pool_world/0091_cloyster.json | 25 ++++- .../spawn_pool_world/0092_gastly.json | 14 +-- .../spawn_pool_world/0093_haunter.json | 14 +-- .../spawn_pool_world/0094_gengar.json | 14 +-- .../cobblemon/spawn_pool_world/0095_onix.json | 4 +- .../spawn_pool_world/0096_drowzee.json | 2 +- .../spawn_pool_world/0098_krabby.json | 2 +- .../spawn_pool_world/0099_kingler.json | 2 +- .../spawn_pool_world/0100_voltorb.json | 2 +- .../spawn_pool_world/0102_exeggcute.json | 4 +- .../spawn_pool_world/0103_exeggutor.json | 4 +- .../spawn_pool_world/0104_cubone.json | 2 +- .../spawn_pool_world/0105_marowak.json | 2 +- .../spawn_pool_world/0106_hitmonlee.json | 5 +- .../spawn_pool_world/0107_hitmonchan.json | 5 +- .../spawn_pool_world/0108_lickitung.json | 5 +- .../spawn_pool_world/0109_koffing.json | 19 +--- .../spawn_pool_world/0110_weezing.json | 17 --- .../spawn_pool_world/0111_rhyhorn.json | 5 +- .../spawn_pool_world/0112_rhydon.json | 5 +- .../spawn_pool_world/0113_chansey.json | 5 +- .../spawn_pool_world/0114_tangela.json | 2 +- .../spawn_pool_world/0115_kangaskhan.json | 3 +- .../spawn_pool_world/0116_horsea.json | 12 +- .../spawn_pool_world/0117_seadra.json | 10 +- .../spawn_pool_world/0118_goldeen.json | 2 +- .../spawn_pool_world/0120_staryu.json | 4 +- .../spawn_pool_world/0121_starmie.json | 4 +- .../spawn_pool_world/0122_mrmime.json | 2 +- .../spawn_pool_world/0123_scyther.json | 7 +- .../cobblemon/spawn_pool_world/0124_jynx.json | 2 +- .../spawn_pool_world/0125_electabuzz.json | 12 +- .../spawn_pool_world/0126_magmar.json | 6 +- .../spawn_pool_world/0127_pinsir.json | 4 +- .../spawn_pool_world/0128_tauros.json | 9 +- .../spawn_pool_world/0129_magikarp.json | 32 ++++++ .../spawn_pool_world/0130_gyarados.json | 30 ++--- .../spawn_pool_world/0131_lapras.json | 26 ++++- .../spawn_pool_world/0132_ditto.json | 2 +- .../spawn_pool_world/0133_eevee.json | 6 +- .../spawn_pool_world/0134_vaporeon.json | 4 +- .../spawn_pool_world/0135_jolteon.json | 2 +- .../spawn_pool_world/0136_flareon.json | 2 +- .../spawn_pool_world/0137_porygon.json | 2 +- .../spawn_pool_world/0138_omanyte.json | 4 +- .../spawn_pool_world/0139_omastar.json | 4 +- .../spawn_pool_world/0140_kabuto.json | 4 +- .../spawn_pool_world/0141_kabutops.json | 4 +- .../spawn_pool_world/0142_aerodactyl.json | 2 +- .../spawn_pool_world/0143_snorlax.json | 2 +- .../spawn_pool_world/0147_dratini.json | 4 +- .../spawn_pool_world/0149_dragonite.json | 2 +- .../spawn_pool_world/0169_crobat.json | 2 +- .../spawn_pool_world/0172_pichu.json | 5 +- .../spawn_pool_world/0173_cleffa.json | 10 +- .../spawn_pool_world/0174_igglybuff.json | 4 +- .../cobblemon/spawn_pool_world/0177_natu.json | 2 +- .../spawn_pool_world/0182_bellossom.json | 16 +-- .../spawn_pool_world/0186_politoed.json | 40 ++++++- .../spawn_pool_world/0193_yanma.json | 19 +++- .../spawn_pool_world/0194_wooper.json | 2 +- .../spawn_pool_world/0196_espeon.json | 2 +- .../spawn_pool_world/0197_umbreon.json | 2 +- .../spawn_pool_world/0198_murkrow.json | 10 +- .../spawn_pool_world/0200_misdreavus.json | 12 +- .../spawn_pool_world/0204_pineco.json | 2 +- .../spawn_pool_world/0205_forretress.json | 2 +- .../spawn_pool_world/0208_steelix.json | 4 +- .../spawn_pool_world/0212_scizor.json | 2 +- .../spawn_pool_world/0215_sneasel.json | 2 +- .../spawn_pool_world/0218_slugma.json | 10 +- .../spawn_pool_world/0220_swinub.json | 2 +- .../spawn_pool_world/0230_kingdra.json | 12 +- .../spawn_pool_world/0233_porygon2.json | 2 +- .../spawn_pool_world/0234_stantler.json | 4 +- .../spawn_pool_world/0236_tyrogue.json | 5 +- .../spawn_pool_world/0237_hitmontop.json | 5 +- .../spawn_pool_world/0238_smoochum.json | 2 +- .../spawn_pool_world/0239_elekid.json | 12 +- .../spawn_pool_world/0240_magby.json | 6 +- .../spawn_pool_world/0241_miltank.json | 9 +- .../spawn_pool_world/0242_blissey.json | 5 +- .../spawn_pool_world/0253_grovyle.json | 2 +- .../spawn_pool_world/0256_combusken.json | 2 +- .../spawn_pool_world/0259_marshtomp.json | 4 +- .../spawn_pool_world/0270_lotad.json | 4 +- .../spawn_pool_world/0272_ludicolo.json | 4 +- .../spawn_pool_world/0273_seedot.json | 2 +- .../spawn_pool_world/0275_shiftry.json | 2 +- .../spawn_pool_world/0293_whismur.json | 32 +++++- .../spawn_pool_world/0294_loudred.json | 30 ++++- .../spawn_pool_world/0295_exploud.json | 30 ++++- .../spawn_pool_world/0299_nosepass.json | 4 +- .../spawn_pool_world/0302_sableye.json | 21 +--- .../spawn_pool_world/0303_mawile.json | 8 +- .../spawn_pool_world/0311_plusle.json | 2 +- .../spawn_pool_world/0312_minun.json | 2 +- .../spawn_pool_world/0318_carvanha.json | 2 +- .../spawn_pool_world/0320_wailmer.json | 2 +- .../spawn_pool_world/0324_torkoal.json | 8 +- .../spawn_pool_world/0327_spinda.json | 10 +- .../spawn_pool_world/0343_baltoy.json | 4 +- .../spawn_pool_world/0344_claydol.json | 2 +- .../spawn_pool_world/0370_luvdisc.json | 2 +- .../spawn_pool_world/0388_grotle.json | 2 +- .../spawn_pool_world/0389_torterra.json | 2 +- .../spawn_pool_world/0391_monferno.json | 4 +- .../spawn_pool_world/0394_prinplup.json | 4 +- .../spawn_pool_world/0401_kricketot.json | 2 +- .../spawn_pool_world/0417_pachirisu.json | 2 +- .../spawn_pool_world/0427_buneary.json | 5 +- .../spawn_pool_world/0428_lopunny.json | 5 +- .../spawn_pool_world/0429_mismagius.json | 14 +-- .../spawn_pool_world/0430_honchkrow.json | 10 +- .../spawn_pool_world/0439_mimejr.json | 2 +- .../spawn_pool_world/0440_happiny.json | 5 +- .../spawn_pool_world/0442_spiritomb.json | 6 +- .../spawn_pool_world/0443_gible.json | 6 +- .../spawn_pool_world/0444_gabite.json | 2 +- .../spawn_pool_world/0445_garchomp.json | 2 +- .../spawn_pool_world/0446_munchlax.json | 2 +- .../spawn_pool_world/0447_riolu.json | 2 +- .../spawn_pool_world/0448_lucario.json | 2 +- .../spawn_pool_world/0461_weavile.json | 2 +- .../spawn_pool_world/0462_magnezone.json | 6 +- .../spawn_pool_world/0463_lickilicky.json | 5 +- .../spawn_pool_world/0464_rhyperior.json | 5 +- .../spawn_pool_world/0465_tangrowth.json | 2 +- .../spawn_pool_world/0466_electivire.json | 15 ++- .../spawn_pool_world/0467_magmortar.json | 6 +- .../spawn_pool_world/0469_yanmega.json | 19 +++- .../spawn_pool_world/0470_leafeon.json | 5 +- .../spawn_pool_world/0471_glaceon.json | 2 +- .../spawn_pool_world/0473_mamoswine.json | 2 +- .../spawn_pool_world/0474_porygonz.json | 2 +- .../spawn_pool_world/0476_probopass.json | 4 +- .../spawn_pool_world/0550_basculin.json | 12 +- .../spawn_pool_world/0556_maractus.json | 2 +- .../spawn_pool_world/0561_sigilyph.json | 2 +- .../spawn_pool_world/0585_deerling.json | 5 +- .../spawn_pool_world/0586_sawsbuck.json | 5 +- .../spawn_pool_world/0587_emolga.json | 2 +- .../spawn_pool_world/0595_joltik.json | 6 +- .../spawn_pool_world/0596_galvantula.json | 2 +- .../spawn_pool_world/0599_klink.json | 10 +- .../spawn_pool_world/0600_klang.json | 6 +- .../spawn_pool_world/0601_klinklang.json | 6 +- .../spawn_pool_world/0605_elgyem.json | 6 +- .../spawn_pool_world/0606_beheeyem.json | 6 +- .../spawn_pool_world/0615_cryogonal.json | 2 +- .../spawn_pool_world/0622_golett.json | 6 +- .../spawn_pool_world/0623_golurk.json | 2 +- .../spawn_pool_world/0631_heatmor.json | 4 +- .../spawn_pool_world/0632_durant.json | 26 ++++- .../spawn_pool_world/0651_quilladin.json | 2 +- .../spawn_pool_world/0657_frogadier.json | 4 +- .../spawn_pool_world/0679_honedge.json | 4 +- .../spawn_pool_world/0681_aegislash.json | 4 +- .../spawn_pool_world/0700_sylveon.json | 2 +- .../spawn_pool_world/0710_pumpkaboo.json | 3 +- .../spawn_pool_world/0711_gourgeist.json | 3 +- .../spawn_pool_world/0712_bergmite.json | 4 +- .../spawn_pool_world/0722_rowlet.json | 2 +- .../spawn_pool_world/0723_dartrix.json | 2 +- .../spawn_pool_world/0725_litten.json | 2 +- .../spawn_pool_world/0726_torracat.json | 2 +- .../spawn_pool_world/0728_popplio.json | 4 +- .../spawn_pool_world/0729_brionne.json | 4 +- .../spawn_pool_world/0755_morelull.json | 4 +- .../spawn_pool_world/0756_shiinotic.json | 4 +- .../spawn_pool_world/0771_pyukumuku.json | 6 +- .../spawn_pool_world/0778_mimikyu.json | 2 +- .../spawn_pool_world/0781_dhelmise.json | 2 +- .../spawn_pool_world/0831_wooloo.json | 2 +- .../spawn_pool_world/0850_sizzlipede.json | 4 +- .../spawn_pool_world/0851_centiskorch.json | 4 +- .../spawn_pool_world/0868_milcery.json | 21 +++- .../spawn_pool_world/0869_alcremie.json | 21 +++- .../spawn_pool_world/0875_eiscue.json | 4 +- .../spawn_pool_world/0899_wyrdeer.json | 4 +- .../spawn_pool_world/0900_kleavor.json | 5 +- .../spawn_pool_world/0978_tatsugiri.json | 4 +- 259 files changed, 1062 insertions(+), 791 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/flowers.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/gemstones.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/underground.json diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/flowers.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/flowers.json new file mode 100644 index 0000000000..c4f8c4f7b2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/flowers.json @@ -0,0 +1,8 @@ +{ + "condition": { + "neededNearbyBlocks": [ + "#minecraft:flowers", + "#c:flowers" + ] + } +} diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/gemstones.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/gemstones.json new file mode 100644 index 0000000000..9ff28bfa07 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/gemstones.json @@ -0,0 +1,18 @@ +{ + "condition": { + "neededNearbyBlocks": [ + "minecraft:amethyst_block", + "minecraft:budding_amethyst", + "#minecraft:crystal_sound_blocks", + "#minecraft:diamond_ores", + "#minecraft:emerald_ores", + "#c:amethyst_ores", + "#c:diamond_ores", + "#c:emerald_ores", + "#c:peridot_ores", + "#c:ruby_ores", + "#c:sapphire_ores", + "#c:topaz_ores" + ] + } +} diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json index 2a30fb9b6b..cf87cbc85c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json @@ -126,5 +126,9 @@ "#c:vermiculite_ores", "#c:zinc_ores" ] + }, + "anticondition": { + "neededBaseBlocks": [ + "minecraft:farmland" } } diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/underground.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/underground.json deleted file mode 100644 index f361517daa..0000000000 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/underground.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "condition": { - "canSeeSky": false, - "neededBaseBlocks": [ - "minecraft:sculk", - "#minecraft:crystal_sound_blocks", - "#minecraft:base_stone_overworld", - "#minecraft:coal_ores", - "#minecraft:copper_ores", - "#minecraft:coral_blocks", - "#minecraft:diamond_ores", - "#minecraft:emerald_ores", - "#minecraft:sculk_replaceable", - "#minecraft:gold_ores", - "#minecraft:iron_ores", - "#minecraft:lapis_ores", - "#minecraft:redstone_ores", - "#c:adamantite_ores", - "#c:aetherium_ores", - "#c:aluminum_ores", - "#c:amethyst_blocks", - "#c:amethyst_ores", - "#c:ancient_debris", - "#c:antimony_ores", - "#c:aquarium_ores", - "#c:asterite_ores", - "#c:asteroid_asterite_ores", - "#c:banglum_ores", - "#c:bauxite_ores", - "#c:carmot_ores", - "#c:certus_quartz_ores", - "#c:cinnabar_ores", - "#c:cobalt_ores", - "#c:galaxium_ores", - "#c:galena_ores", - "#c:galena_ores", - "#c:kyber_ores", - "#c:lead_ores", - "#c:lignite_coal_ores", - "#c:lunum_ores", - "#c:lutetium_ores", - "#c:manganese_ores", - "#c:meteor_metite_ores", - "#c:metite_ores", - "#c:midas_gold_ores", - "#c:moon_lunum_ores", - "#c:mozanite_ores", - "#c:mythril_ores", - "#c:natural_stones", - "#c:nickel_ores", - "#c:nikolite_ores", - "#c:ores", - "#c:orichalcum_ores", - "#c:osmium_ores", - "#c:palladium_ores", - "#c:peridot_ores", - "#c:platinum_ores", - "#c:prometheum_ores", - "#c:pyrite_ores", - "#c:quadrillum_ores", - "#c:quartz_ores", - "#c:raw_antimony_ores", - "#c:raw_copper_ores", - "#c:raw_gold_ores", - "#c:raw_iridium_ores", - "#c:raw_iron_ores", - "#c:raw_lead_ores", - "#c:raw_nickel_ores", - "#c:raw_platinum_ores", - "#c:raw_silver_ores", - "#c:raw_tin_ores", - "#c:raw_titanium_ores", - "#c:raw_tungsten_ores", - "#c:raw_uranium_ores", - "#c:red_sandstones", - "#c:ruby_ores", - "#c:runite_ores", - "#c:salt_ores", - "#c:sapphire_ores", - "#c:sheldonite_ores", - "#c:silver_ores", - "#c:sodalite_ores", - "#c:sphalerite_ores", - "#c:starrite_ores", - "#c:stellum_ores", - "#c:stone", - "#c:stormyx_ores", - "#c:sulfur_ores", - "#c:tantalite_ores", - "#c:terracotta_blocks", - "#c:tin_ores", - "#c:titanium_ores", - "#c:topaz_ores", - "#c:truesilver_ores", - "#c:tungsten_ores", - "#c:unobtainium_ores", - "#c:ur_ores", - "#c:uranium_ores", - "#c:vermiculite_ores", - "#c:zinc_ores" - ] - } -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0009_blastoise.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0009_blastoise.json index 86a509c991..44d2c24c96 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0009_blastoise.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0009_blastoise.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "blastoise", + "id": "blastoise-1", "pokemon": "blastoise", "presets": [ "natural", @@ -20,7 +20,7 @@ } }, { - "id": "blastoise", + "id": "blastoise-2", "pokemon": "blastoise", "presets": [ "river", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json index 0f0355dcfe..d2675fcd71 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "2-19", + "level": "1-20", "weight": 7.0, "condition": { "canSeeSky": true, @@ -23,7 +23,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } }, @@ -38,7 +39,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "2-19", + "level": "1-20", "weight": 7.0, "condition": { "canSeeSky": true, @@ -57,7 +58,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "2-19", + "level": "1-20", "weight": 7.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json index 04af40f6d1..5bf4b16d70 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-20", + "level": "7-21", "weight": 2.0, "condition": { "canSeeSky": true, @@ -23,7 +23,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } }, @@ -38,7 +39,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-20", + "level": "7-21", "weight": 2.0, "condition": { "canSeeSky": true, @@ -57,7 +58,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-20", + "level": "7-21", "weight": 2.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json index e4e6184514..4ace616ec5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-39", + "level": "10-40", "weight": 1.0, "condition": { "canSeeSky": true, @@ -24,9 +24,31 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_floral", + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } + }, + { + "id": "butterfree-2", + "pokemon": "butterfree", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-40", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "timeRange": "day", + "isRaining": false + } }, { "id": "butterfree-valencian-1", @@ -37,7 +59,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-39", + "level": "10-40", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json index fa95614231..4da2f3a475 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "2-19", + "level": "1-20", "weight": 7.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json index 70122ac3b1..ce43ff3e2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-20", + "level": "7-21", "weight": 2.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json index 1463dbe378..599ce51dee 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-39", + "level": "10-40", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json index 27d9adebbe..1b8ae2e9cc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json @@ -13,16 +13,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "5-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate", "#cobblemon:is_sky" - ], - "timeRange": "day", - "isRaining": false + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json index 67971c7077..a45ca7a754 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json @@ -20,9 +20,7 @@ "biomes": [ "#cobblemon:is_temperate", "#cobblemon:is_sky" - ], - "timeRange": "day", - "isRaining": false + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json index 61ac5d06eb..1cf64ba627 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json @@ -20,9 +20,7 @@ "biomes": [ "#cobblemon:is_temperate", "#cobblemon:is_sky" - ], - "timeRange": "day", - "isRaining": false + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0019_rattata.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0019_rattata.json index ce6c380d67..e0503c1eac 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0019_rattata.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0019_rattata.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": true, @@ -31,12 +31,12 @@ "id": "rattata-2", "pokemon": "rattata", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, @@ -60,7 +60,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, @@ -79,12 +79,12 @@ "id": "rattata-alolan-1", "pokemon": "rattata alolan", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, @@ -108,7 +108,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, @@ -132,7 +132,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": true, @@ -151,7 +151,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0020_raticate.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0020_raticate.json index 32d46f2b9c..ecf884b651 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0020_raticate.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0020_raticate.json @@ -31,7 +31,7 @@ "id": "raticate-2", "pokemon": "raticate", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -79,7 +79,7 @@ "id": "raticate-alolan-1", "pokemon": "raticate alolan", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json index 260aca24e8..b4851efcf1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-26", + "level": "1-26", "weight": 9.0, "condition": { "canSeeSky": true, @@ -21,9 +21,7 @@ "#cobblemon:is_badlands", "#cobblemon:is_savanna", "#cobblemon:is_sky" - ], - "timeRange": "day", - "isRaining": false + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json index c124e60be1..54dda4a9eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json @@ -21,9 +21,7 @@ "#cobblemon:is_badlands", "#cobblemon:is_savanna", "#cobblemon:is_sky" - ], - "timeRange": "day", - "isRaining": false + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json index 035fe06087..ae04b19480 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 4.05, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 0.27, "condition": { "canSeeSky": true, @@ -48,7 +48,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 0.27, "condition": { "canSeeSky": true, @@ -66,7 +66,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 0.27, "condition": { "canSeeSky": true, @@ -84,7 +84,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 0.27, "condition": { "canSeeSky": true, @@ -102,7 +102,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 0.27, "condition": { "canSeeSky": true, @@ -120,7 +120,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "weight": 5.4, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json index 31eef4a4c1..4e4130457c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-32", + "level": "16-32", "weight": 0.18, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json index a5a42fde2f..dac60a7ec3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-48", + "level": "27-49", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json index e5ab30f378..d829755faf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "6-30", + "level": "5-30", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json index 13240c1664..2d11badc74 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "5-27", + "level": "3-28", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json index 0218e762cb..44c65f083e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-36", + "level": "16-37", "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json index ec91d31f6d..7c19646957 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "37-50", + "level": "37-51", "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json index 7ea4425c93..f077d8e08f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "5-27", + "level": "3-28", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json index 48eff5b307..6fb2feea48 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-36", + "level": "16-37", "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json index e1704072f9..59141c1a6c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "37-50", + "level": "37-51", "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json index 1c9d86b81c..f2b66aa594 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-32", + "level": "17-32", "weight": 0.9, "condition": { "canSeeSky": true, @@ -26,12 +26,12 @@ "id": "clefairy-2", "pokemon": "clefairy", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-32", + "level": "17-32", "weight": 0.9, "condition": { "canSeeSky": false, @@ -49,7 +49,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-32", + "level": "17-32", "weight": 0.9, "condition": { "canSeeSky": true, @@ -69,7 +69,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-32", + "level": "17-32", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json index 55fe50eb06..f6f17831df 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-48", + "level": "27-48", "weight": 0.1, "condition": { "canSeeSky": true, @@ -26,12 +26,12 @@ "id": "clefable-2", "pokemon": "clefable", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-48", + "level": "27-48", "weight": 0.1, "condition": { "canSeeSky": false, @@ -49,7 +49,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-48", + "level": "27-48", "weight": 0.1, "condition": { "canSeeSky": true, @@ -68,7 +68,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-48", + "level": "27-48", "weight": 0.1, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json index 5870e23111..068e3a0fe9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json @@ -12,12 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-30", - "weight": 5.94, + "level": "5-30", + "weight": 9.9, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "#cobblemon:is_taiga" ], "timeRange": "twilight" }, @@ -36,8 +37,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-30", - "weight": 5.94, + "level": "5-30", + "weight": 9.9, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json index 2e0211fc5a..5ac256214c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json @@ -12,12 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "31-50", - "weight": 0.06, + "level": "25-51", + "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "#cobblemon:is_taiga" ], "timeRange": "twilight" }, @@ -36,8 +37,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "31-50", - "weight": 0.06, + "level": "25-51", + "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json index 35ac90f95e..ad3871c439 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-27", + "level": "16-27", "weight": 0.9, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-27", + "level": "16-27", "weight": 0.18, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json index 93671cdc0c..9132041baa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-43", + "level": "22-44", "weight": 0.1, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-43", + "level": "22-44", "weight": 0.02, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json index dc9ef2f131..d00b51e469 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json @@ -38,7 +38,7 @@ "id": "zubat-2", "pokemon": "zubat", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json index 33e408f779..0e824a80ea 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json @@ -38,7 +38,7 @@ "id": "golbat-2", "pokemon": "golbat", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json index 49669d3768..66cab0ce4b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-32", + "level": "7-32", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_jungle" - ], - "timeRange": "night" + ] } }, { @@ -30,15 +29,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "4-32", - "weight": 9.0, + "bucket": "common", + "level": "7-32", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" - ], - "timeRange": "night" + ] } }, { @@ -49,15 +47,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "4-32", - "weight": 9.0, + "bucket": "common", + "level": "7-32", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "night" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json index c245ace9ea..9d28f7d7f3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "21-39", + "level": "21-40", "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_jungle" - ], - "timeRange": "night" + ] } }, { @@ -30,15 +29,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "21-39", - "weight": 0.9, + "bucket": "common", + "level": "21-40", + "weight": 0.18, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" - ], - "timeRange": "night" + ] } }, { @@ -49,15 +47,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "21-39", - "weight": 0.9, + "bucket": "common", + "level": "21-40", + "weight": 0.18, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "night" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0045_vileplume.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0045_vileplume.json index e5e8727303..ad4e1e089a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0045_vileplume.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0045_vileplume.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "40-49", + "level": "35-49", "weight": 0.1, "condition": { "canSeeSky": true, @@ -31,9 +31,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "40-49", - "weight": 0.1, + "bucket": "common", + "level": "35-49", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ @@ -50,9 +50,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "40-49", - "weight": 0.1, + "bucket": "common", + "level": "35-49", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json index e55695639e..2a8769b53c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "11-28", + "level": "4-29", "weight": 9.0, "condition": { "canSeeSky": false, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "11-28", + "level": "4-29", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json index d102d059a7..7df7665614 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "24-40", + "level": "24-41", "weight": 1.0, "condition": { "canSeeSky": false, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "24-40", + "level": "24-41", "weight": 1.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0048_venonat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0048_venonat.json index 39402ec98b..206e37d373 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0048_venonat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0048_venonat.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "13-30", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0050_diglett.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0050_diglett.json index 6e9a6b83cb..e02d518e9a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0050_diglett.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0050_diglett.json @@ -7,12 +7,12 @@ "id": "diglett-1", "pokemon": "diglett", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-26", + "level": "2-27", "weight": 9.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0051_dugtrio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0051_dugtrio.json index 95e15439d5..013326c65c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0051_dugtrio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0051_dugtrio.json @@ -7,12 +7,12 @@ "id": "dugtrio-1", "pokemon": "dugtrio", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "26-42", + "level": "26-43", "weight": 1.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json index 26da82ac10..a00fad5adc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-29", + "level": "4-29", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json index 5fb910bc72..2641c1b1cb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-32", + "level": "7-32", "weight": 5.4, "condition": { "canSeeSky": true @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "12-32", + "level": "7-32", "weight": 5.4, "condition": { "canSeeSky": true diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0056_mankey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0056_mankey.json index 424f89ce77..cefd6af594 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0056_mankey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0056_mankey.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-30", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0057_primeape.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0057_primeape.json index 8f7d1ba6d1..6e489e0faf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0057_primeape.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0057_primeape.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-45", + "level": "28-46", "weight": 0.54, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json index 93912e853f..ce478c2787 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-35", + "level": "10-35", "weight": 5.94, "condition": { "canSeeSky": true, @@ -22,8 +22,7 @@ "#cobblemon:is_grassland", "#cobblemon:is_snowy", "#cobblemon:is_tundra" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json index be18465d9e..7b12b29468 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json @@ -7,13 +7,13 @@ "id": "arcanine-1", "pokemon": "arcanine", "presets": [ - "urban", - "natural" + "natural", + "urban" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "36-55", + "level": "30-56", "weight": 0.06, "condition": { "canSeeSky": true, @@ -22,8 +22,7 @@ "#cobblemon:is_grassland", "#cobblemon:is_snowy", "#cobblemon:is_tundra" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json index 2737f37d2e..a5ef6388c4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "6-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "6-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, @@ -38,6 +38,42 @@ "minecraft:lily_pad" ] } + }, + { + "id": "poliwag-3", + "pokemon": "poliwag", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "poliwag-4", + "pokemon": "poliwag", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json index 7f911e3613..bbc2a82c3d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "25-38", + "level": "25-39", "weight": 0.9, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "25-38", + "level": "25-39", "weight": 0.9, "condition": { "canSeeSky": true, @@ -38,6 +38,42 @@ "minecraft:lily_pad" ] } + }, + { + "id": "poliwhirl-3", + "pokemon": "poliwhirl", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-39", + "weight": 0.18, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "poliwhirl-4", + "pokemon": "poliwhirl", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "25-39", + "weight": 0.54, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json index 2ffdcb87c7..600e8d972e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "39-51", + "level": "34-51", "weight": 0.05, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "39-51", + "level": "34-51", "weight": 0.05, "condition": { "canSeeSky": true, @@ -38,6 +38,42 @@ "minecraft:lily_pad" ] } + }, + { + "id": "poliwrath-3", + "pokemon": "poliwrath", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-51", + "weight": 0.01, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "poliwrath-4", + "pokemon": "poliwrath", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "34-51", + "weight": 0.03, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json index a3fed48ec1..58bc9d0c50 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "5-31", + "level": "6-31", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json index 4b4e970706..f909055512 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "41-50", + "level": "35-50", "weight": 0.1, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json index 9e055fb870..adaf29e5dc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-30", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json index 44754a0f9f..b32632c0a7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-40", + "level": "28-41", "weight": 0.54, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json index 53e41bab8a..e356224c68 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", + "level": "36-51", "weight": 0.06, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0069_bellsprout.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0069_bellsprout.json index e2ff525bf2..b89d9c2284 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0069_bellsprout.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0069_bellsprout.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0071_victreebel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0071_victreebel.json index 7fa9016b05..8a41628e95 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0071_victreebel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0071_victreebel.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "40-49", + "level": "34-49", "weight": 0.1, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json index ff08222060..aa2a976d01 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json @@ -12,14 +12,14 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "8-33", + "level": "9-34", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_deep_ocean" + "#cobblemon:is_deep" ], - "maxHeight": 52 + "maxHeight": 48 } }, { @@ -31,17 +31,18 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "8-33", + "level": "9-34", "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ "#minecraft:is_ocean" - ] + ], + "maxHeight": 48 }, "anticondition": { "biomes": [ - "#minecraft:is_deep_ocean" + "#cobblemon:is_deep" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json index 3000a845b3..48fe90bada 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json @@ -12,14 +12,14 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "30-51", + "level": "30-52", "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_deep_ocean" + "#cobblemon:is_deep" ], - "maxHeight": 52 + "maxHeight": 48 } }, { @@ -31,17 +31,18 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "30-51", + "level": "30-52", "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ "#minecraft:is_ocean" - ] + ], + "maxHeight": 48 }, "anticondition": { "biomes": [ - "#minecraft:is_deep_ocean" + "#cobblemon:is_deep" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json index 26739f271f..07f29c37d4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, @@ -25,12 +25,12 @@ "id": "geodude-2", "pokemon": "geodude", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json index 8b43fe9054..dce2428881 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json @@ -25,7 +25,7 @@ "id": "graveler-2", "pokemon": "graveler", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json index 2f7b4a0a4c..3e6920e62a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "40-49", + "level": "34-50", "weight": 0.1, "condition": { "canSeeSky": true, @@ -25,12 +25,12 @@ "id": "golem-2", "pokemon": "golem", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "40-49", + "level": "34-50", "weight": 0.1, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json index 0cecf6fbe0..5db109b992 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-41", + "level": "16-41", "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" ], - "timeRange": "day", "isRaining": false } }, @@ -32,7 +31,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-41", + "level": "16-41", "weight": 5.4, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json index 51a662c508..a92c13d1d1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json @@ -19,7 +19,6 @@ "biomes": [ "#cobblemon:is_grassland" ], - "timeRange": "day", "isRaining": false } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json index 8c384e5a75..2b69e4450f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-31", + "level": "7-32", "weight": 5.4, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json index c80f6de030..d08b7d55a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "12-32", - "weight": 1.8, + "bucket": "common", + "level": "8-33", + "weight": 9.0, "condition": { "biomes": [ "#cobblemon:is_overworld" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json index 6e8b199b92..9d24d48803 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "30-46", - "weight": 0.18, + "bucket": "common", + "level": "30-47", + "weight": 0.9, "condition": { "biomes": [ "#cobblemon:is_overworld" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json index b1deda2d53..88cae07917 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json @@ -12,15 +12,17 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "rare", - "level": "15-38", + "bucket": "uncommon", + "level": "13-38", "weight": 10.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" ], - "timeRange": "day" + "neededNearbyBlocks": [ + "#minecraft:water" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json index 7e74acab82..02bdfe55ae 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-31", + "level": "6-31", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json index a917c5f4d2..298efb98dc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json @@ -18,8 +18,7 @@ "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json index 1fe21d9fc3..3311606c6a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "11-32", + "level": "8-33", "weight": 9.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "11-32", + "level": "8-33", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json index 44810b2087..7131744168 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "34-47", + "level": "34-48", "weight": 1.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "34-47", + "level": "34-48", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json index 32181929a6..b082322488 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "15-32", + "level": "8-33", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json index f30fa19ddd..30e3e7892e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json @@ -12,13 +12,36 @@ "type": "pokemon", "context": "seafloor", "bucket": "common", - "level": "12-30", + "level": "6-31", "weight": 9.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_frigid" + ] + } + }, + { + "id": "shellder-2", + "pokemon": "shellder", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "common", + "level": "6-31", + "weight": 5.94, "condition": { "canSeeSky": true, "biomes": [ "#minecraft:is_ocean" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_frigid" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json index 23cbc93ec6..02e48a1d35 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json @@ -12,13 +12,36 @@ "type": "pokemon", "context": "seafloor", "bucket": "common", - "level": "31-52", + "level": "26-53", "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_frigid" + ] + } + }, + { + "id": "cloyster-2", + "pokemon": "cloyster", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "common", + "level": "26-53", + "weight": 0.06, "condition": { "canSeeSky": true, "biomes": [ "#minecraft:is_ocean" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_frigid" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json index d8df2bef2e..84a1b6eccb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json @@ -7,12 +7,12 @@ "id": "gastly-1", "pokemon": "gastly", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "8-31", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": false, @@ -25,12 +25,12 @@ "id": "gastly-2", "pokemon": "gastly", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-31", + "level": "6-31", "weight": 9.0, "condition": { "canSeeSky": false, @@ -54,7 +54,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "8-31", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": false, @@ -72,7 +72,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-31", + "level": "6-31", "weight": 9.0, "condition": { "canSeeSky": true, @@ -91,7 +91,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-31", + "level": "6-31", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json index 1accf70fc6..9690376bfb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json @@ -7,12 +7,12 @@ "id": "haunter-1", "pokemon": "haunter", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "25-40", + "level": "25-41", "weight": 0.54, "condition": { "canSeeSky": false, @@ -25,12 +25,12 @@ "id": "haunter-2", "pokemon": "haunter", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "25-40", + "level": "25-41", "weight": 0.9, "condition": { "canSeeSky": false, @@ -54,7 +54,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "25-40", + "level": "25-41", "weight": 0.54, "condition": { "canSeeSky": false, @@ -72,7 +72,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "25-40", + "level": "25-41", "weight": 0.9, "condition": { "canSeeSky": true, @@ -91,7 +91,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "25-40", + "level": "25-41", "weight": 0.9, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json index baa04b6b64..82c14c734b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json @@ -7,12 +7,12 @@ "id": "gengar-1", "pokemon": "gengar", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "41-50", + "level": "36-50", "weight": 0.06, "condition": { "canSeeSky": false, @@ -25,12 +25,12 @@ "id": "gengar-2", "pokemon": "gengar", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", + "level": "36-50", "weight": 0.1, "condition": { "canSeeSky": false, @@ -54,7 +54,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "41-50", + "level": "36-50", "weight": 0.06, "condition": { "canSeeSky": false, @@ -72,7 +72,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", + "level": "36-50", "weight": 0.1, "condition": { "canSeeSky": true, @@ -91,7 +91,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", + "level": "36-50", "weight": 0.1, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json index 70092a1b5e..4d9b7fb0a7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json @@ -7,12 +7,12 @@ "id": "onix-1", "pokemon": "onix", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-38", + "level": "14-39", "weight": 5.94, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json index 0ff5e535a6..165b4fc46d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-33", + "level": "8-33", "weight": 5.4, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json index 479ea021bc..dd006874f1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-32", + "level": "8-33", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json index 7e5e945e74..62ff293d0c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-47", + "level": "28-48", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json index 7e29e887bd..9ab6cc7c2b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "13-33", + "level": "8-33", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json index a98b8608d8..97f9642983 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json @@ -11,8 +11,8 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "10-32", + "bucket": "common", + "level": "8-33", "weight": 1.98, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json index b010af0651..4d9a5a1326 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json @@ -11,8 +11,8 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "33-53", + "bucket": "common", + "level": "28-53", "weight": 0.02, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json index 28fe4e8365..1e4910c004 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-32", + "level": "7-32", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json index 9532535fdb..9f2d5b09ef 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-42", + "level": "28-43", "weight": 0.2, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json index 4343476555..675191dac1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-45", + "level": "20-46", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json index 89a5dc8b39..e93be55fbf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-45", + "level": "20-46", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json index 37053d78bf..5290dbca5d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "18-32", + "level": "14-39", "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json index 1cbde841d4..3235e8f2b0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-34", + "level": "9-34", "weight": 1.8, "condition": { "canSeeSky": true, @@ -20,23 +20,6 @@ "#cobblemon:is_swamp" ] } - }, - { - "id": "koffing-2", - "pokemon": "koffing", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "12-34", - "weight": 1.8, - "condition": { - "biomes": [ - "#minecraft:is_nether" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json index a9e7f6506d..8313e867a2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json @@ -20,23 +20,6 @@ "#cobblemon:is_swamp" ] } - }, - { - "id": "weezing-2", - "pokemon": "weezing", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "35-49", - "weight": 0.2, - "condition": { - "biomes": [ - "#minecraft:is_nether" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json index 5a77af4e7f..ca505e95ad 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "15-34", + "level": "10-35", "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json index 2facd58a8e..e6872796f4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "42-48", + "level": "42-49", "weight": 0.18, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json index 19cc6c31c2..60c45922ed 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json @@ -13,14 +13,13 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "4-45", + "level": "17-45", "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json index 3ee8b992d8..c75f8d813e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-23", + "level": "19-44", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json index c94da865c1..004c6a32fc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json @@ -18,8 +18,7 @@ "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json index 69c904cf6b..f77fd37316 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json @@ -7,18 +7,18 @@ "id": "horsea-1", "pokemon": "horsea", "presets": [ - "underwater", - "natural" + "underwater" ], "type": "pokemon", "context": "submerged", - "bucket": "uncommon", - "level": "10-29", - "weight": 9.0, + "bucket": "common", + "level": "5-30", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_lukewarm" + "#cobblemon:is_lukewarm", + "#cobblemon:is_reef" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json index b7f3a5018a..c314944601 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json @@ -7,18 +7,18 @@ "id": "seadra-1", "pokemon": "seadra", "presets": [ - "underwater", - "natural" + "underwater" ], "type": "pokemon", "context": "submerged", - "bucket": "uncommon", + "bucket": "common", "level": "32-44", - "weight": 0.9, + "weight": 0.18, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_lukewarm" + "#cobblemon:is_lukewarm", + "#cobblemon:is_reef" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json index eba7ead94c..7b73b03170 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "10-32", + "level": "7-32", "weight": 9.0, "condition": { "canSeeSky": true diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json index 7ac031ea65..68f609e3c8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-34", + "level": "9-34", "weight": 9.9, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "seafloor", "bucket": "uncommon", - "level": "12-34", + "level": "9-34", "weight": 5.94, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json index 3d726c962c..4023b7bb3e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "35-52", + "level": "29-52", "weight": 0.1, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "seafloor", "bucket": "uncommon", - "level": "35-52", + "level": "29-52", "weight": 0.06, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json index 1233f9f4e9..7b77b339fb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "32-46", + "level": "26-46", "weight": 0.2, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json index 2569a3fcf0..2a9173847f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "20-50", + "level": "25-50", "weight": 1.98, "condition": { "canSeeSky": true, @@ -23,7 +23,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } }, @@ -36,7 +37,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-50", + "level": "25-50", "weight": 1.98, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json index 1e04bcbc8c..a130369faa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "30-45", + "level": "30-46", "weight": 0.2, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json index 318c144d8c..46d49d4b62 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json @@ -12,12 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "30-49", - "weight": 0.54, + "level": "30-50", + "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ], "isThundering": true } @@ -31,12 +32,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "30-49", + "level": "30-50", "weight": 0.18, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ], "neededNearbyBlocks": [ "minecraft:lightning_rod" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json index 44a5f4315f..6c1ebbbb02 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "30-49", + "level": "30-50", "weight": 0.9, "condition": { "canSeeSky": true, @@ -39,7 +39,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "30-49", + "level": "30-50", "weight": 0.9, "condition": { "canSeeSky": true, @@ -58,7 +58,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "30-49", + "level": "30-50", "weight": 0.9, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json index e46810cef8..542c5d885e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json @@ -13,14 +13,14 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "20-50", + "level": "25-50", "weight": 10.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_jungle" ], - "timeRange": "day" + "timeRange": "night" } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json index aaec44a5b4..3367c15511 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json @@ -11,15 +11,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "20-49", - "weight": 6.0, + "bucket": "common", + "level": "24-49", + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json index cca223a33d..da49066c55 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json @@ -18,6 +18,21 @@ "condition": { "canSeeSky": true } + }, + { + "id": "magikarp-2", + "pokemon": "magikarp", + "presets": [ + "freshwater", + "water_surface" + ], + "type": "pokemon", + "bucket": "common", + "level": "1-20", + "weight": 1.98, + "condition": { + "canSeeSky": true + } }, { "id": "magikarp-2", @@ -36,6 +51,23 @@ "#minecraft:is_ocean" ] } + }, + { + "id": "magikarp-4", + "pokemon": "magikarp", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "bucket": "common", + "level": "1-20", + "weight": 1.98, + "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/0130_gyarados.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json index 9c22099305..bfea1140b4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json @@ -3,33 +3,33 @@ "neededInstalledMods": [], "neededUninstalledMods": [], "spawns": [ - { + { "id": "gyarados-1", "pokemon": "gyarados", "presets": [ - "water_surface", + "underwater", "freshwater" ], "type": "pokemon", - "bucket": "uncommon", + "context": "submerged", + "bucket": "common", "level": "20-54", - "weight": 2, + "weight": 0.1, "condition": { "canSeeSky": true } }, - { + { "id": "gyarados-2", "pokemon": "gyarados", "presets": [ - "underwater", + "water_surface", "freshwater" ], "type": "pokemon", - "context": "submerged", "bucket": "common", "level": "20-54", - "weight": 0.1, + "weight": 0.02, "condition": { "canSeeSky": true } @@ -38,12 +38,13 @@ "id": "gyarados-3", "pokemon": "gyarados", "presets": [ - "water_surface" + "underwater" ], "type": "pokemon", - "bucket": "uncommon", + "context": "submerged", + "bucket": "common", "level": "20-54", - "weight": 2, + "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ @@ -51,17 +52,16 @@ ] } }, - { + { "id": "gyarados-4", "pokemon": "gyarados", "presets": [ - "underwater" + "water_surface" ], "type": "pokemon", - "context": "submerged", "bucket": "common", "level": "20-54", - "weight": 0.1, + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json index 50aaf548af..1faa7cc37e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json @@ -10,11 +10,33 @@ "water_surface" ], "type": "pokemon", + "bucket": "uncommon", + "level": "29-54", + "weight": 2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen" + ] + } + }, + { + "id": "lapras-2", + "pokemon": "lapras", + "presets": [ + "water_surface" + ], + "type": "pokemon", "bucket": "rare", - "level": "20-53", - "weight": 10, + "level": "29-54", + "weight": 2, "condition": { "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ] + }, + "anticondition": { "biomes": [ "#cobblemon:is_frozen" ] 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 c6da5eb0a5..ac2b3eaa52 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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "1-29", + "level": "4-29", "weight": 10.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json index 79ad391b31..070132efc8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "5-32", + "level": "5-33", "weight": 9.0, "condition": { "canSeeSky": true, @@ -22,7 +22,7 @@ } }, { - "id": "eevee-1", + "id": "eevee-2", "pokemon": "eevee", "presets": [ "natural" @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "5-32", + "level": "5-33", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json index e1cee645be..1cf6bbf33b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json index 99fe3a4243..7f4bde3862 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json index 0813164ddb..d646bbaa25 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0137_porygon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0137_porygon.json index 5a8a58f58a..8235022dd1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0137_porygon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0137_porygon.json @@ -9,7 +9,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "15-39", + "level": "15-40", "weight": 9, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0138_omanyte.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0138_omanyte.json index c260e1baf2..36a36c788a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0138_omanyte.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0138_omanyte.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "15-35", + "level": "11-36", "weight": 9.0, "condition": { "biomes": [ @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "15-35", + "level": "11-36", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0139_omastar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0139_omastar.json index 2cecdb6b5b..d8d45e42cf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0139_omastar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0139_omastar.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "40-49", + "level": "40-50", "weight": 1.0, "condition": { "biomes": [ @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "40-49", + "level": "40-50", "weight": 1.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0140_kabuto.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0140_kabuto.json index 556f363813..38e18b4c6d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0140_kabuto.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0140_kabuto.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "15-35", + "level": "11-36", "weight": 9.0, "condition": { "biomes": [ @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "15-35", + "level": "11-36", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0141_kabutops.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0141_kabutops.json index decbbf9edc..1e70601d63 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0141_kabutops.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0141_kabutops.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "40-49", + "level": "40-50", "weight": 1.0, "condition": { "biomes": [ @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "40-49", + "level": "40-50", "weight": 1.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0142_aerodactyl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0142_aerodactyl.json index b8fa07e291..ff5a4d6027 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0142_aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0142_aerodactyl.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "25-51", + "level": "27-52", "weight": 10.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json index 1dbd87c3d8..191679ac4f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "20-54", + "level": "34-54", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json index 8f4aceaab7..14c9b1fdcc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json @@ -11,7 +11,7 @@ ], "type": "pokemon", "bucket": "rare", - "level": "15-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": false, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "rare", - "level": "15-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json index 3ddb93e71f..aa9db2d2e4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json @@ -7,7 +7,7 @@ "id": "dragonite-1", "pokemon": "dragonite", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json index 12436924be..d4e17cf72f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json @@ -38,7 +38,7 @@ "id": "crobat-2", "pokemon": "crobat", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json index c2d3eeef88..cb305dc3a8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-20", + "level": "1-21", "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json index 503cb4de84..9319ca5a7c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-22", + "level": "1-22", "weight": 9.0, "condition": { "canSeeSky": true, @@ -26,12 +26,12 @@ "id": "cleffa-2", "pokemon": "cleffa", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-22", + "level": "1-22", "weight": 9.0, "condition": { "canSeeSky": false, @@ -49,7 +49,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-22", + "level": "1-22", "weight": 9.0, "condition": { "canSeeSky": true, @@ -69,7 +69,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-22", + "level": "1-22", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json index f28517fa4e..e5048b7a58 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 9.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json index 501f2d58c7..e24fca275c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "10-32", + "level": "7-32", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0182_bellossom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0182_bellossom.json index 5a8ee8bdd3..257556c00f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0182_bellossom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0182_bellossom.json @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "40-49", - "weight": 0.05, + "level": "35-49", + "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ @@ -30,9 +30,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "40-49", - "weight": 0.05, + "bucket": "common", + "level": "35-49", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ @@ -49,9 +49,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "40-49", - "weight": 0.05, + "bucket": "common", + "level": "35-49", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json index 1dd56f1a52..20d672abd6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "39-51", + "level": "34-50", "weight": 0.05, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "39-51", + "level": "34-50", "weight": 0.05, "condition": { "canSeeSky": true, @@ -38,6 +38,42 @@ "minecraft:lily_pad" ] } + }, + { + "id": "politoed-3", + "pokemon": "politoed", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-50", + "weight": 0.01, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "politoed-4", + "pokemon": "politoed", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "34-50", + "weight": 0.03, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json index 1609f4d22c..99f44ec98c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json @@ -12,13 +12,30 @@ ], "type": "pokemon", "bucket": "common", - "level": "11-39", + "level": "14-39", "weight": 5.4, "condition": { "canSeeSky": true, "timeRange": "day", "isRaining": false } + }, + { + "id": "yanma-2", + "pokemon": "yanma", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "bucket": "common", + "level": "14-39", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json index 9ee9ed75c3..b029214671 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -31,7 +31,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json index d0f5039c37..79ddd8629a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json index 27655f10c6..5d71e065d8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json index c15683b675..c4898bb207 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "15-40", + "level": "16-41", "weight": 1.98, "condition": { "canSeeSky": true, @@ -22,8 +22,7 @@ "#cobblemon:is_swamp", "#cobblemon:is_taiga" ], - "timeRange": "night", - "isRaining": false + "timeRange": "night" } }, { @@ -36,14 +35,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "15-40", + "level": "16-41", "weight": 1.98, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_spooky" - ], - "isRaining": false + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json index 6b139b54c5..285b00f948 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "14-43", + "level": "19-44", "weight": 1.98, "condition": { "canSeeSky": true, @@ -26,12 +26,12 @@ "id": "misdreavus-2", "pokemon": "misdreavus", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "14-43", + "level": "19-44", "weight": 5.94, "condition": { "canSeeSky": false, @@ -50,7 +50,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "14-43", + "level": "19-44", "weight": 5.94, "condition": { "canSeeSky": false, @@ -69,7 +69,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "14-43", + "level": "19-44", "weight": 1.98, "condition": { "canSeeSky": true, @@ -88,7 +88,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "14-43", + "level": "19-44", "weight": 1.98, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0204_pineco.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0204_pineco.json index 2ca3767ea3..4bf195dcde 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0204_pineco.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0204_pineco.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-30", + "level": "4-29", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json index aa8f585690..c553ddab92 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "31-46", + "level": "31-47", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json index 4303527da3..e5e36b174f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json @@ -7,12 +7,12 @@ "id": "steelix-1", "pokemon": "steelix", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "39-51", + "level": "34-51", "weight": 0.06, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json index 563b3e39bc..fb7ad58977 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "50", + "level": "45-50", "weight": 0.02, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json index a9234e0de9..6677ad2da7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-43", + "level": "18-43", "weight": 9.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json index d7a90cd355..09e6213507 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-25", + "level": "1-25", "weight": 1.8, "condition": { "biomes": [ @@ -30,7 +30,7 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "8-25", + "level": "1-25", "weight": 9.0, "condition": { "biomes": [ @@ -47,7 +47,7 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "8-25", + "level": "1-25", "weight": 1.8, "condition": { "biomes": [ @@ -69,7 +69,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-25", + "level": "1-25", "weight": 9.0, "condition": { "biomes": [ @@ -89,7 +89,7 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "8-25", + "level": "1-25", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json index e6d1a5e511..a7b8d7d351 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "5-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json index c0895dd1c5..cad8931ff0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json @@ -11,15 +11,15 @@ ], "type": "pokemon", "context": "submerged", - "bucket": "uncommon", - "level": "45-54", - "weight": 0.1, + "bucket": "common", + "level": "39-54", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_lukewarm" - ], - "isRaining": true + "#cobblemon:is_lukewarm", + "#cobblemon:is_reef" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0233_porygon2.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0233_porygon2.json index a5e97aac93..b7318b8b30 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0233_porygon2.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0233_porygon2.json @@ -9,7 +9,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "40-51", + "level": "35-52", "weight": 0.9, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json index c8d6efa25b..e6763f3806 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "16-46", - "weight": 9.0, + "level": "22-47", + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json index e5ddfa7504..b9be4d70c1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "5-21", + "level": "1-21", "weight": 1.98, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json index 1afebbe0d6..094a7e81ff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-45", + "level": "20-46", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json index e3a7c5c459..293950769d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-30", + "level": "6-31", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json index a9a35f958b..14883b1d21 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json @@ -12,12 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-36", - "weight": 5.4, + "level": "11-36", + "weight": 9, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ], "isThundering": true } @@ -31,12 +32,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-36", + "level": "11-36", "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ], "neededNearbyBlocks": [ "minecraft:lightning_rod" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json index ef8341ab72..f60f645eb5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-36", + "level": "11-36", "weight": 9.0, "condition": { "canSeeSky": true, @@ -39,7 +39,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-36", + "level": "11-36", "weight": 9.0, "condition": { "canSeeSky": true, @@ -58,7 +58,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-36", + "level": "11-36", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0241_miltank.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0241_miltank.json index 058f2fe94f..7766d60f64 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0241_miltank.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0241_miltank.json @@ -11,15 +11,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "15-49", - "weight": 10.0, + "bucket": "common", + "level": "6-24", + "weight": 6.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json index eb9b1eacee..04861681f3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json @@ -13,14 +13,13 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "46-54", + "level": "40-54", "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json index c1ebb9c3c6..de173d6de9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json index 8124fc461f..3a68cb5997 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0259_marshtomp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0259_marshtomp.json index 9290c3567c..e288904944 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0259_marshtomp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0259_marshtomp.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json index f80a84ca04..701df3345a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "6-22", + "level": "1-22", "weight": 1.8, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "6-22", + "level": "1-22", "weight": 5.4, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json index f41e573ffb..03c42231d0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "35-48", + "level": "29-48", "weight": 0.02, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "35-48", + "level": "29-48", "weight": 0.06, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json index 3c21e5287e..5dd7caf6e9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "6-22", + "level": "1-22", "weight": 5.4, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json index be5c521ced..1d093c7318 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "35-48", + "level": "29-48", "weight": 0.06, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json index f711f46448..9595b8207e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json @@ -7,19 +7,43 @@ "id": "whismur-1", "pokemon": "whismur", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "5-24", - "weight": 9.0, + "bucket": "common", + "level": "1-24", + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_abyss" ] } + }, + { + "id": "whismur-2", + "pokemon": "whismur", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ], + "maxY": 0 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json index 4fa6bf9584..30ecdbaf8d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json @@ -7,19 +7,43 @@ "id": "loudred-1", "pokemon": "loudred", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "20-39", - "weight": 0.9, + "weight": 0.54, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_abyss" ] } + }, + { + "id": "loudred-2", + "pokemon": "loudred", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-39", + "weight": 0.18, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ], + "maxY": 0 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json index aa85aff355..5bba0b7a4f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json @@ -7,19 +7,43 @@ "id": "exploud-1", "pokemon": "exploud", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "40-49", - "weight": 0.1, + "weight": 0.06, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_abyss" ] } + }, + { + "id": "exploud-2", + "pokemon": "exploud", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "40-49", + "weight": 0.02, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ], + "maxY": 0 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json index afce98c21d..d5722ad0a6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json @@ -7,12 +7,12 @@ "id": "nosepass-1", "pokemon": "nosepass", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-37", + "level": "13-38", "weight": 5.94, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json index 79855bb869..b26421930b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json @@ -7,31 +7,18 @@ "id": "sableye-1", "pokemon": "sableye", "presets": [ - "underground" + "natural", + "gemstones" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "15-38", - "weight": 2.0, + "level": "13-38", + "weight": 6.0, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_overworld" - ], - "neededNearbyBlocks": [ - "minecraft:amethyst_block", - "minecraft:budding_amethyst", - "#minecraft:crystal_sound_blocks", - "#minecraft:diamond_ores", - "#minecraft:emerald_ores", - "#c:amethyst_ores", - "#c:diamond_ores", - "#c:emerald_ores", - "#c:peridot_ores", - "#c:ruby_ores", - "#c:sapphire_ores", - "#c:topaz_ores" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0303_mawile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0303_mawile.json index bfe67508e3..596c799b83 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0303_mawile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0303_mawile.json @@ -7,12 +7,12 @@ "id": "mawile-1", "pokemon": "mawile", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-38", + "level": "13-38", "weight": 6.0, "condition": { "canSeeSky": false, @@ -25,12 +25,12 @@ "id": "mawile-2", "pokemon": "mawile", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "16-38", + "level": "13-38", "weight": 6.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json index 0b9d1f8aa9..1ef02c30b7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-40", + "level": "16-41", "weight": 5.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json index a197f25814..208f834bbe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-40", + "level": "16-41", "weight": 5.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json index 1c276606ec..519c171791 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "submerged", "bucket": "uncommon", - "level": "12-30", + "level": "6-31", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json index dfef720b99..1cd2657e82 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "submerged", "bucket": "uncommon", - "level": "18-40", + "level": "15-40", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json index 7100954410..cd61c70a48 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-47", + "level": "22-47", "weight": 10.0, "condition": { "biomes": [ @@ -29,7 +29,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "20-47", + "level": "22-47", "weight": 10.0, "condition": { "biomes": [ @@ -45,12 +45,12 @@ "id": "torkoal-3", "pokemon": "torkoal", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-47", + "level": "22-47", "weight": 10.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json index a5908038ca..caf26da494 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 9.9, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, @@ -50,7 +50,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, @@ -69,7 +69,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, @@ -88,7 +88,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json index 27278d0719..6b8ab93e4e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json @@ -7,12 +7,12 @@ "id": "baltoy-1", "pokemon": "baltoy", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-30", + "level": "5-30", "weight": 5.4, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json index fca82efc09..bc933634b5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json @@ -7,7 +7,7 @@ "id": "claydol-1", "pokemon": "claydol", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0370_luvdisc.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0370_luvdisc.json index 38284fd2bd..c7c6a63b05 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0370_luvdisc.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0370_luvdisc.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-33", + "level": "8-33", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0388_grotle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0388_grotle.json index ec2af31a14..6e4649512a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0388_grotle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0388_grotle.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "18-40", + "level": "18-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0389_torterra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0389_torterra.json index 541ce67d29..3c7c16e825 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0389_torterra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0389_torterra.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "32-52", + "level": "32-53", "weight": 0.1, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json index a6b21027ab..39881f249f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "14-40", + "level": "14-41", "weight": 0.9, "condition": { "biomes": [ @@ -31,7 +31,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "14-40", + "level": "14-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0394_prinplup.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0394_prinplup.json index 554ec91764..d71d75cfd1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0394_prinplup.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0394_prinplup.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0401_kricketot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0401_kricketot.json index c9b6990c1e..39dc7d6cde 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0401_kricketot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0401_kricketot.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "2-19", + "level": "1-19", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json index 47e4e5f758..d46ac32477 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "13-40", + "level": "16-40", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json index ca8a188dac..6da3124e73 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json @@ -12,14 +12,15 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-35", + "level": "10-35", "weight": 9.9, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_hills", - "#cobblemon:is_snowy" + "#cobblemon:is_snowy", + "#cobblemon:is_taiga" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json index 85527348ea..52af01c5e0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json @@ -12,14 +12,15 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "36-48", + "level": "30-48", "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_hills", - "#cobblemon:is_snowy" + "#cobblemon:is_snowy", + "#cobblemon:is_taiga" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json index 2b3821a27b..4ab021de11 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "44-49", + "level": "39-50", "weight": 0.02, "condition": { "canSeeSky": true, @@ -26,12 +26,12 @@ "id": "mismagius-2", "pokemon": "mismagius", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "44-49", + "level": "39-50", "weight": 0.06, "condition": { "canSeeSky": false, @@ -50,10 +50,10 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "44-49", + "level": "39-50", "weight": 0.06, "condition": { - "canSeeSky": true, + "canSeeSky": false, "biomes": [ "#cobblemon:is_spooky", "#cobblemon:is_swamp" @@ -69,7 +69,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "44-49", + "level": "39-50", "weight": 0.02, "condition": { "canSeeSky": true, @@ -88,7 +88,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "44-49", + "level": "39-50", "weight": 0.02, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json index 05055caeb9..7729b526ad 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "41-50", + "level": "36-51", "weight": 0.02, "condition": { "canSeeSky": true, @@ -22,8 +22,7 @@ "#cobblemon:is_swamp", "#cobblemon:is_taiga" ], - "timeRange": "night", - "isRaining": false + "timeRange": "night" } }, { @@ -36,14 +35,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", + "level": "36-51", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_spooky" - ], - "isRaining": false + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json index 566a8d8663..c24d4641df 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-31", + "level": "6-31", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json index ff05e2316c..ea37e03ff7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json @@ -13,14 +13,13 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "4-22", + "level": "1-22", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json index cf861d549b..d5122f666c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json @@ -7,12 +7,12 @@ "id": "spiritomb-1", "pokemon": "spiritomb", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "25-48", + "level": "24-49", "weight": 20.0, "condition": { "canSeeSky": false, @@ -36,7 +36,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "25-48", + "level": "24-49", "weight": 10.0, "condition": { "canSeeSky": false diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json index 0e9645ffc8..4a07809484 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-30", + "level": "5-30", "weight": 5.4, "condition": { "biomes": [ @@ -24,12 +24,12 @@ "id": "gible-2", "pokemon": "gible", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "12-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json index d0addac13d..f7bc53819d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json @@ -24,7 +24,7 @@ "id": "gabite-2", "pokemon": "gabite", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json index 17beca526e..c7d1e59324 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json @@ -24,7 +24,7 @@ "id": "garchomp-2", "pokemon": "garchomp", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json index 66d40389ec..9d13d7fb78 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-39", + "level": "24-39", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json index 5040e099ee..71153d5b39 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-28", + "level": "4-29", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json index dac564aa0a..b70ca86697 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "29-52", + "level": "24-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json index 4ef02a7d0a..2261d1cf25 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json @@ -9,7 +9,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "44-51", + "level": "38-51", "weight": 0.1, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json index 76dd5133dd..08d8707615 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "47-53", - "weight": 0.02, + "bucket": "common", + "level": "42-54", + "weight": 0.1, "condition": { "biomes": [ "#cobblemon:is_overworld" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json index 1190d1f1bb..7167abc9a5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-51", + "level": "34-52", "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json index 2dcbef794d..f0bc41779f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "49-53", + "level": "44-54", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_hills" - ], - "timeRange": "day" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json index 197ca988ea..fabee65011 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "24-53", + "level": "24-54", "weight": 0.2, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json index 23d8b54a9f..10bf46786b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json @@ -12,12 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "50-54", - "weight": 0.06, + "level": "45-54", + "weight": 0.1, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ], "isThundering": true } @@ -25,15 +26,19 @@ { "id": "electivire-2", "pokemon": "electivire", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "50-54", + "level": "45-54", "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ], "neededNearbyBlocks": [ "minecraft:lightning_rod" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json index d3a2e1ff2a..1732e26935 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "50-54", + "level": "45-54", "weight": 0.1, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "50-54", + "level": "45-54", "weight": 0.1, "condition": { "canSeeSky": true, @@ -47,7 +47,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "50-54", + "level": "45-54", "weight": 0.1, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json index db2aeb614c..14a0ac4376 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json @@ -12,13 +12,30 @@ ], "type": "pokemon", "bucket": "common", - "level": "33-51", + "level": "33-52", "weight": 0.6, "condition": { "canSeeSky": true, "timeRange": "day", "isRaining": false } + }, + { + "id": "yanmega-2", + "pokemon": "yanmega", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "bucket": "common", + "level": "33-52", + "weight": 0.2, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json index c469f6df97..f508fedf29 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, @@ -23,7 +23,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json index 346047aa5a..ef787d1994 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json index 5193adc987..76cb860b25 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "46-53", + "level": "40-53", "weight": 0.1, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0474_porygonz.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0474_porygonz.json index e0cce7df29..ece6cb123d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0474_porygonz.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0474_porygonz.json @@ -9,7 +9,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "52-53", + "level": "47-54", "weight": 0.1, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json index 1ee6677184..4d53b88e0d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json @@ -7,12 +7,12 @@ "id": "probopass-1", "pokemon": "probopass", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "38-52", + "level": "33-53", "weight": 0.06, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json index 74f4fcc395..b8d0c58af6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-46", + "level": "21-46", "weight": 10.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "uncommon", - "level": "4-46", + "level": "21-46", "weight": 10.0, "condition": { "canSeeSky": true, @@ -47,7 +47,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-46", + "level": "21-46", "weight": 5.0, "condition": { "canSeeSky": true, @@ -64,7 +64,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-46", + "level": "21-46", "weight": 10.0, "condition": { "canSeeSky": true, @@ -81,7 +81,7 @@ "type": "pokemon", "context": "submerged", "bucket": "uncommon", - "level": "4-46", + "level": "21-46", "weight": 10.0, "condition": { "canSeeSky": true, @@ -98,7 +98,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-46", + "level": "21-46", "weight": 5.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json index 403c99e8f7..a76881a96a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-46", + "level": "21-46", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json index 16fa40f15d..4bdf151d66 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "20-49", + "level": "24-49", "weight": 2.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json index 6c86fe32e5..a24ac4e21a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-33", + "level": "9-34", "weight": 1.8, "condition": { "canSeeSky": true, @@ -23,8 +23,7 @@ "#cobblemon:is_plains", "#cobblemon:is_snowy", "#cobblemon:is_taiga" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json index 84f2187079..31524ccea8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "34-47", + "level": "34-48", "weight": 0.2, "condition": { "canSeeSky": true, @@ -23,8 +23,7 @@ "#cobblemon:is_plains", "#cobblemon:is_snowy", "#cobblemon:is_taiga" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json index 5be62ac860..42905a1d7f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "10-43", + "level": "18-43", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json index b3789276da..146da68b35 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-32", + "level": "7-32", "weight": 5.4, "condition": { "canSeeSky": true, @@ -28,12 +28,12 @@ "id": "joltik-2", "pokemon": "joltik", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-32", + "level": "7-32", "weight": 5.4, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json index c51c3e09a6..0706da634a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json @@ -28,7 +28,7 @@ "id": "galvantula-2", "pokemon": "galvantula", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json index 13329fe47d..e37e47ea01 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json @@ -7,12 +7,12 @@ "id": "klink-1", "pokemon": "klink", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "12-30", + "bucket": "common", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": false, @@ -38,8 +38,8 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "12-30", + "bucket": "common", + "level": "5-30", "weight": 9.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json index 0137f8adf2..acdeb7320c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json @@ -7,11 +7,11 @@ "id": "klang-1", "pokemon": "klang", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "38-44", "weight": 0.9, "condition": { @@ -38,7 +38,7 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "38-44", "weight": 0.9, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json index 861ccc023d..46bc77743a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json @@ -7,11 +7,11 @@ "id": "klinklang-1", "pokemon": "klinklang", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "49-52", "weight": 0.1, "condition": { @@ -38,7 +38,7 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "49-52", "weight": 0.1, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json index 3a46858237..ddbf50b416 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-33", + "level": "9-34", "weight": 9.0, "condition": { "biomes": [ @@ -29,8 +29,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-33", - "weight": 1.8, + "level": "9-34", + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json index 870b5e77fb..f255cf637c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "42-48", + "level": "42-49", "weight": 1.0, "condition": { "biomes": [ @@ -29,8 +29,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "42-48", - "weight": 0.2, + "level": "42-49", + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json index 1ca6c7c404..2e43f2cbd7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-51", + "level": "27-52", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json index bf8fb8dfef..fdc61106b1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json @@ -7,12 +7,12 @@ "id": "golett-1", "pokemon": "golett", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-30", + "level": "5-30", "weight": 42.0, "condition": { "canSeeSky": false, @@ -36,7 +36,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "20-30", + "level": "5-30", "weight": 1.8, "condition": { "canSeeSky": false diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json index a66a9d6d32..10aa468572 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json @@ -7,7 +7,7 @@ "id": "golurk-1", "pokemon": "golurk", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json index 1d31155d51..65f38ca1da 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-48", + "level": "23-48", "weight": 10.0, "condition": { "canSeeSky": true, @@ -31,7 +31,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-48", + "level": "23-48", "weight": 10.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json index f44dd18bd1..afd18b9954 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json @@ -12,10 +12,30 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "16-48", + "level": "23-48", "weight": 2.0, "condition": { - "biomes": [ + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_hills" + ] + } + }, + { + "id": "durant-1", + "pokemon": "durant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-48", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "biomes": [ "#cobblemon:is_badlands", "#cobblemon:is_hills" ] @@ -30,7 +50,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-48", + "level": "23-48", "weight": 10.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0651_quilladin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0651_quilladin.json index 91ac7b5498..01f7973253 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0651_quilladin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0651_quilladin.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0657_frogadier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0657_frogadier.json index 29972429ab..669e6fe8a6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0657_frogadier.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0657_frogadier.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true @@ -29,7 +29,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json index 5df17b9198..93ce5300d8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json @@ -9,7 +9,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-32", + "level": "8-33", "weight": 9.0, "condition": { "biomes": [ @@ -38,7 +38,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-32", + "level": "8-33", "weight": 9.0, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json index eeea9217fd..f1a26b52a8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json @@ -9,7 +9,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "46-50", + "level": "40-50", "weight": 0.1, "condition": { "biomes": [ @@ -38,7 +38,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "46-50", + "level": "40-50", "weight": 0.1, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json index 9afc80c600..d8ae624b74 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "15-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json index ad8396a2a6..1820adc4a1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json @@ -12,10 +12,9 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-33", + "level": "9-34", "weight": 5.4, "condition": { - "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json index f55c150488..bc7d6b59ad 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json @@ -12,10 +12,9 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "34-49", + "level": "29-49", "weight": 0.6, "condition": { - "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index 69633b6ce3..b17b51ac9c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, @@ -29,7 +29,7 @@ ], "type": "pokemon", "bucket": "common", - "level": "9-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json index a831ffcd11..1c8a84b624 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "5-16", + "level": "5-32", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json index 4e2108bb18..b5216bdabe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "17-33", + "level": "17-42", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0725_litten.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0725_litten.json index e96813bda3..36abfe2455 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0725_litten.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0725_litten.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "5-16", + "level": "5-32", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0726_torracat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0726_torracat.json index b2badb8911..97be726235 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0726_torracat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0726_torracat.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "17-33", + "level": "17-42", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json index 11d0be7eab..f7f7081d09 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "5-16", + "level": "5-32", "weight": 9.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "5-16", + "level": "5-32", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json index 6be2e51c5d..1388c6975e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "17-33", + "level": "17-42", "weight": 0.9, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "17-33", + "level": "17-42", "weight": 0.9, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json index 4051a72a32..f274bf3fa8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-28", + "level": "4-29", "weight": 1.8, "condition": { "biomes": [ @@ -32,7 +32,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-28", + "level": "4-29", "weight": 1.8, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json index ca61b20ccd..a26adb4f8b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "24-40", + "level": "24-41", "weight": 0.2, "condition": { "biomes": [ @@ -32,7 +32,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "24-40", + "level": "24-41", "weight": 0.2, "condition": { "canSeeSky": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json index 3e72d78204..2f45cd75cb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "15-41", + "level": "16-41", "weight": 6.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "15-41", + "level": "16-41", "weight": 2.0, "condition": { "canSeeSky": true, @@ -53,7 +53,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "15-41", + "level": "16-41", "weight": 10.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json index b58bfe97f7..2aecf60994 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-48", + "level": "23-48", "weight": 4.0, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json index 344763b5a7..a7b1fa00de 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "20-52", + "level": "27-52", "weight": 2.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json index e0a1eb6d0a..d812df75c1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-27", + "level": "2-27", "weight": 9.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json index ef3574acd4..c6bf891984 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "6-31", "weight": 5.4, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json index 467b2a2e8e..d711e82f25 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-52", + "level": "28-53", "weight": 0.6, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-52", + "level": "28-53", "weight": 0.6, "condition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json index 55aefeaac1..428c08ee31 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json @@ -9,8 +9,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "5-27", - "weight": 1.98, + "level": "2-27", + "weight": 9.9, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -19,6 +19,23 @@ "minecraft:cake" ] } + }, + { + "id": "milcery-2", + "pokemon": "milcery", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "2-27", + "weight": 1.98, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:sugar_cane" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json index 67e4017305..ac96e8d268 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json @@ -9,8 +9,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-49", - "weight": 0.02, + "level": "22-50", + "weight": 0.1, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -19,6 +19,23 @@ "minecraft:cake" ] } + }, + { + "id": "alcremie-2", + "pokemon": "alcremie", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "22-50", + "weight": 0.02, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:sugar_cane" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json index 02c534e3d7..70dc579fc5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-47", + "level": "22-47", "weight": 6.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "12-47", + "level": "22-47", "weight": 6.0, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json index ca57b0c090..e68f37a66a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "47-52", - "weight": 1.0, + "level": "42-53", + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json index b4158ba14c..3d1640fa6d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "50", + "level": "45-50", "weight": 0.02, "condition": { "canSeeSky": true, @@ -23,7 +23,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json index 2090719493..d8ec06dd86 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "17-47", + "level": "23-48", "weight": 10.0, "condition": { "canSeeSky": true, @@ -30,7 +30,7 @@ "type": "pokemon", "context": "submerged", "bucket": "rare", - "level": "17-47", + "level": "23-48", "weight": 10.0, "condition": { "canSeeSky": true, From 507319fa0fb8046e53e8b0b5c9bebe968bed53ed Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Sun, 10 Sep 2023 04:12:10 -0400 Subject: [PATCH 02/40] Added new presets and biome tags. Updated presets and biome tags. Updated spawn files. --- .../spawn_detail_presets/ancient_city.json | 26 ++++++++ .../spawn_detail_presets/derelict.json | 1 - .../spawn_detail_presets/desert_pyramid.json | 22 +++++++ .../spawn_detail_presets/end_city.json | 19 ++++++ .../spawn_detail_presets/freshwater.json | 8 ++- .../illager_structures.json | 10 +++ .../spawn_detail_presets/jungle_pyramid.json | 18 ++++++ .../spawn_detail_presets/nether_fossil.json | 10 +++ .../nether_structures.json | 30 +++++++++ .../spawn_detail_presets/ocean_monument.json | 13 ++++ .../spawn_detail_presets/ocean_ruins.json | 18 ++++++ .../pillager_outpost.json | 23 +++++++ .../cobblemon/spawn_detail_presets/river.json | 8 ++- .../spawn_detail_presets/ruined_portal.json | 12 ++++ .../ruined_structures.json | 20 ------ .../spawn_detail_presets/shipwreck.json | 12 ++++ .../spawn_detail_presets/stronghold.json | 15 +++++ .../spawn_detail_presets/trail_ruins.json | 58 +++++++++++++++++ .../cobblemon/spawn_detail_presets/urban.json | 14 ++-- .../woodland_mansion.json | 22 +++++++ .../spawn_pool_world/0004_charmander.json | 2 +- .../spawn_pool_world/0005_charmeleon.json | 2 +- .../spawn_pool_world/0006_charizard.json | 2 +- .../spawn_pool_world/0016_pidgey.json | 3 +- .../spawn_pool_world/0017_pidgeotto.json | 3 +- .../spawn_pool_world/0018_pidgeot.json | 3 +- .../spawn_pool_world/0021_spearow.json | 3 +- .../spawn_pool_world/0022_fearow.json | 3 +- .../spawn_pool_world/0023_ekans.json | 2 +- .../spawn_pool_world/0024_arbok.json | 2 +- .../spawn_pool_world/0025_pikachu.json | 6 ++ .../spawn_pool_world/0026_raichu.json | 6 ++ .../spawn_pool_world/0037_vulpix.json | 61 ++++++++++++++++-- .../spawn_pool_world/0038_ninetales.json | 61 ++++++++++++++++-- .../spawn_pool_world/0039_jigglypuff.json | 12 ++++ .../spawn_pool_world/0040_wigglytuff.json | 12 ++++ .../spawn_pool_world/0041_zubat.json | 18 ++++++ .../spawn_pool_world/0042_golbat.json | 18 ++++++ .../spawn_pool_world/0043_oddish.json | 18 ++++++ .../spawn_pool_world/0044_gloom.json | 18 ++++++ .../spawn_pool_world/0046_paras.json | 22 +++++++ .../spawn_pool_world/0047_parasect.json | 22 +++++++ .../spawn_pool_world/0052_meowth.json | 40 ++++++++++-- .../spawn_pool_world/0053_persian.json | 40 ++++++++++-- .../spawn_pool_world/0058_growlithe.json | 11 ++-- .../spawn_pool_world/0059_arcanine.json | 11 ++-- .../cobblemon/spawn_pool_world/0063_abra.json | 42 ++++++++++++ .../spawn_pool_world/0064_kadabra.json | 42 ++++++++++++ .../spawn_pool_world/0065_alakazam.json | 42 ++++++++++++ .../spawn_pool_world/0066_machop.json | 6 ++ .../spawn_pool_world/0067_machoke.json | 6 ++ .../spawn_pool_world/0068_machamp.json | 6 ++ .../spawn_pool_world/0072_tentacool.json | 6 +- .../spawn_pool_world/0073_tentacruel.json | 6 +- .../spawn_pool_world/0077_ponyta.json | 11 +++- .../spawn_pool_world/0078_rapidash.json | 11 +++- .../spawn_pool_world/0081_magnemite.json | 26 +++++++- .../spawn_pool_world/0082_magneton.json | 26 +++++++- .../spawn_pool_world/0083_farfetchd.json | 6 ++ .../spawn_pool_world/0084_doduo.json | 6 ++ .../spawn_pool_world/0085_dodrio.json | 6 ++ .../spawn_pool_world/0088_grimer.json | 52 ++++++++++++++- .../cobblemon/spawn_pool_world/0089_muk.json | 52 ++++++++++++++- .../spawn_pool_world/0090_shellder.json | 6 +- .../spawn_pool_world/0091_cloyster.json | 6 +- .../cobblemon/spawn_pool_world/0095_onix.json | 19 +++++- .../spawn_pool_world/0096_drowzee.json | 2 +- .../spawn_pool_world/0097_hypno.json | 2 +- .../spawn_pool_world/0100_voltorb.json | 32 +++++++++- .../spawn_pool_world/0101_electrode.json | 32 +++++++++- .../spawn_pool_world/0102_exeggcute.json | 2 +- .../spawn_pool_world/0103_exeggutor.json | 2 +- .../spawn_pool_world/0104_cubone.json | 18 ++++++ .../spawn_pool_world/0105_marowak.json | 18 ++++++ .../spawn_pool_world/0106_hitmonlee.json | 8 ++- .../spawn_pool_world/0107_hitmonchan.json | 8 ++- .../spawn_pool_world/0108_lickitung.json | 6 ++ .../spawn_pool_world/0109_koffing.json | 28 +++++++- .../spawn_pool_world/0110_weezing.json | 28 +++++++- .../spawn_pool_world/0111_rhyhorn.json | 6 ++ .../spawn_pool_world/0112_rhydon.json | 6 ++ .../spawn_pool_world/0113_chansey.json | 6 ++ .../spawn_pool_world/0115_kangaskhan.json | 6 ++ .../spawn_pool_world/0120_staryu.json | 12 +++- .../spawn_pool_world/0121_starmie.json | 12 +++- .../spawn_pool_world/0122_mrmime.json | 26 ++++++-- .../spawn_pool_world/0123_scyther.json | 4 +- .../cobblemon/spawn_pool_world/0124_jynx.json | 11 +++- .../spawn_pool_world/0125_electabuzz.json | 31 ++------- .../spawn_pool_world/0126_magmar.json | 10 +-- .../spawn_pool_world/0128_tauros.json | 6 ++ .../spawn_pool_world/0129_magikarp.json | 4 +- .../spawn_pool_world/0130_gyarados.json | 4 +- .../spawn_pool_world/0131_lapras.json | 2 +- .../spawn_pool_world/0132_ditto.json | 37 +++++++++++ .../spawn_pool_world/0133_eevee.json | 42 ++++++++++++ .../spawn_pool_world/0134_vaporeon.json | 37 +++++++++++ .../spawn_pool_world/0135_jolteon.json | 37 +++++++++++ .../spawn_pool_world/0136_flareon.json | 37 +++++++++++ .../spawn_pool_world/0147_dratini.json | 19 ++++++ .../spawn_pool_world/0148_dragonair.json | 19 ++++++ .../spawn_pool_world/0149_dragonite.json | 19 ++++++ .../spawn_pool_world/0169_crobat.json | 18 ++++++ .../spawn_pool_world/0172_pichu.json | 6 ++ .../spawn_pool_world/0174_igglybuff.json | 12 ++++ .../cobblemon/spawn_pool_world/0177_natu.json | 23 ++++++- .../cobblemon/spawn_pool_world/0178_xatu.json | 23 ++++++- .../spawn_pool_world/0194_wooper.json | 44 ------------- .../spawn_pool_world/0195_quagsire.json | 44 ------------- .../spawn_pool_world/0196_espeon.json | 37 +++++++++++ .../spawn_pool_world/0197_umbreon.json | 37 +++++++++++ .../spawn_pool_world/0198_murkrow.json | 33 ++++++++-- .../spawn_pool_world/0200_misdreavus.json | 16 ++--- .../spawn_pool_world/0205_forretress.json | 18 ++++++ .../spawn_pool_world/0208_steelix.json | 19 +++++- .../spawn_pool_world/0212_scizor.json | 2 +- .../spawn_pool_world/0215_sneasel.json | 2 +- .../spawn_pool_world/0218_slugma.json | 6 +- .../spawn_pool_world/0219_magcargo.json | 6 +- .../spawn_pool_world/0234_stantler.json | 6 ++ .../spawn_pool_world/0236_tyrogue.json | 8 ++- .../spawn_pool_world/0237_hitmontop.json | 8 ++- .../spawn_pool_world/0238_smoochum.json | 11 +++- .../spawn_pool_world/0239_elekid.json | 31 ++------- .../spawn_pool_world/0240_magby.json | 10 +-- .../spawn_pool_world/0242_blissey.json | 6 ++ .../spawn_pool_world/0293_whismur.json | 4 +- .../spawn_pool_world/0294_loudred.json | 4 +- .../spawn_pool_world/0295_exploud.json | 4 +- .../spawn_pool_world/0299_nosepass.json | 2 +- .../spawn_pool_world/0311_plusle.json | 34 +++++++++- .../spawn_pool_world/0312_minun.json | 34 +++++++++- .../spawn_pool_world/0318_carvanha.json | 2 +- .../spawn_pool_world/0319_sharpedo.json | 2 +- .../spawn_pool_world/0324_torkoal.json | 36 +++++------ .../spawn_pool_world/0343_baltoy.json | 22 ++++++- .../spawn_pool_world/0344_claydol.json | 22 ++++++- .../spawn_pool_world/0390_chimchar.json | 14 ++-- .../spawn_pool_world/0391_monferno.json | 14 ++-- .../spawn_pool_world/0392_infernape.json | 14 ++-- .../spawn_pool_world/0417_pachirisu.json | 6 ++ .../spawn_pool_world/0427_buneary.json | 2 +- .../spawn_pool_world/0428_lopunny.json | 2 +- .../spawn_pool_world/0429_mismagius.json | 16 ++--- .../spawn_pool_world/0430_honchkrow.json | 33 ++++++++-- .../spawn_pool_world/0439_mimejr.json | 24 +++++-- .../spawn_pool_world/0440_happiny.json | 6 ++ .../spawn_pool_world/0442_spiritomb.json | 40 ++++++++---- .../spawn_pool_world/0447_riolu.json | 6 ++ .../spawn_pool_world/0448_lucario.json | 6 ++ .../spawn_pool_world/0461_weavile.json | 2 +- .../spawn_pool_world/0462_magnezone.json | 26 +++++++- .../spawn_pool_world/0463_lickilicky.json | 6 ++ .../spawn_pool_world/0464_rhyperior.json | 6 ++ .../spawn_pool_world/0466_electivire.json | 31 ++------- .../spawn_pool_world/0467_magmortar.json | 21 ++++-- .../spawn_pool_world/0470_leafeon.json | 37 +++++++++++ .../spawn_pool_world/0471_glaceon.json | 37 +++++++++++ .../spawn_pool_world/0476_probopass.json | 2 +- .../spawn_pool_world/0498_tepig.json | 20 +++--- .../spawn_pool_world/0499_pignite.json | 22 +++---- .../spawn_pool_world/0500_emboar.json | 23 +++---- .../spawn_pool_world/0501_oshawott.json | 18 ------ .../spawn_pool_world/0502_dewott.json | 18 ------ .../spawn_pool_world/0503_samurott.json | 18 ------ .../spawn_pool_world/0561_sigilyph.json | 64 +++++++++++++------ .../spawn_pool_world/0585_deerling.json | 6 ++ .../spawn_pool_world/0586_sawsbuck.json | 6 ++ .../spawn_pool_world/0587_emolga.json | 6 ++ .../spawn_pool_world/0615_cryogonal.json | 17 +++++ .../spawn_pool_world/0622_golett.json | 39 +++++++---- .../spawn_pool_world/0623_golurk.json | 39 +++++++---- .../spawn_pool_world/0631_heatmor.json | 12 +++- .../spawn_pool_world/0632_durant.json | 8 +-- .../spawn_pool_world/0700_sylveon.json | 37 +++++++++++ .../spawn_pool_world/0710_pumpkaboo.json | 17 +++++ .../spawn_pool_world/0711_gourgeist.json | 17 +++++ .../spawn_pool_world/0728_popplio.json | 18 ------ .../spawn_pool_world/0729_brionne.json | 18 ------ .../spawn_pool_world/0730_primarina.json | 18 ------ .../spawn_pool_world/0761_bounsweet.json | 2 +- .../spawn_pool_world/0771_pyukumuku.json | 6 +- .../spawn_pool_world/0778_mimikyu.json | 20 +++++- .../spawn_pool_world/0781_dhelmise.json | 11 ++-- .../spawn_pool_world/0831_wooloo.json | 6 ++ .../spawn_pool_world/0832_dubwool.json | 6 ++ .../spawn_pool_world/0850_sizzlipede.json | 20 +++++- .../spawn_pool_world/0851_centiskorch.json | 20 +++++- .../spawn_pool_world/0868_milcery.json | 27 +++++++- .../spawn_pool_world/0869_alcremie.json | 27 +++++++- .../spawn_pool_world/0899_wyrdeer.json | 6 ++ .../spawn_pool_world/0900_kleavor.json | 2 +- .../tags/worldgen/biome/is_floral.json | 3 +- .../tags/worldgen/biome/is_forest.json | 3 +- .../tags/worldgen/biome/is_nether_basalt.json | 18 ++++++ .../worldgen/biome/is_nether_crimson.json | 26 ++++++++ .../tags/worldgen/biome/is_nether_desert.json | 26 ++++++++ .../tags/worldgen/biome/is_nether_forest.json | 25 ++++++++ .../tags/worldgen/biome/is_nether_frozen.json | 9 +++ .../tags/worldgen/biome/is_nether_fungus.json | 51 +++++++++++++++ .../worldgen/biome/is_nether_mountain.json | 10 +++ .../worldgen/biome/is_nether_overgrowth.json | 25 ++++++++ .../tags/worldgen/biome/is_nether_quartz.json | 13 ++++ .../worldgen/biome/is_nether_soul_fire.json | 22 +++++++ .../worldgen/biome/is_nether_soul_sand.json | 30 +++++++++ .../tags/worldgen/biome/is_nether_toxic.json | 17 +++++ .../tags/worldgen/biome/is_nether_warped.json | 22 +++++++ .../worldgen/biome/is_nether_wasteland.json | 30 +++++++++ .../tags/worldgen/biome/is_ocean.json | 8 +++ 209 files changed, 2959 insertions(+), 638 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_structures.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_basalt.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_crimson.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_desert.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_forest.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_frozen.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_fungus.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_mountain.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_overgrowth.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_quartz.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_fire.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_sand.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_toxic.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_warped.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_wasteland.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json new file mode 100644 index 0000000000..e2ea0c2abd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json @@ -0,0 +1,26 @@ +{ + "condition": { + "structures": [ + "ancient_city" + ], + "maxY": 62, + "neededNearbyBlocks": [ + "minecraft:chiseled_deepslate", + "minecraft:cobbled_deepslate_wall", + "minecraft:cracked_deepslate_bricks", + "minecraft:cracked_deepslate_tiles", + "minecraft:deepslate_brick_slab", + "minecraft:deepslate_brick_stairs", + "minecraft:deepslate_brick_wall", + "minecraft:deepslate_bricks", + "minecraft:deepslate_tile_slab", + "minecraft:deepslate_tile_stairs", + "minecraft:deepslate_tile_wall", + "minecraft:deepslate_tiles", + "minecraft:polished_basalt", + "minecraft:polished_deepslate", + "minecraft:polished_deepslate_slab", + "minecraft:polished_deepslate_wall" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/derelict.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/derelict.json index e07173ce46..5d7db31ffb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/derelict.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/derelict.json @@ -25,7 +25,6 @@ "#minecraft:lapis_ores", "#minecraft:logs", "#minecraft:nylium", - "#minecraft:overworld_natural_logs", "#minecraft:redstone_ores", "#minecraft:sand", "#minecraft:snow", diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json new file mode 100644 index 0000000000..3a701fd7a4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json @@ -0,0 +1,22 @@ +{ + "condition": { + "structures": [ + "desert_pyramid" + ], + "minY": 62, + "neededNearbyBlocks": [ + "minecraft:chiseled_sandstone", + "minecraft:cut_sandstone", + "minecraft:orange_terracotta", + "minecraft:sandstone", + "minecraft:sandstone_slab", + "minecraft:sandstone_stairs" + ] + }, + "anticondition": { + "neededBaseBlocks": [ + "minecraft:blue_terracotta", + "minecraft:orange_terracotta" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json new file mode 100644 index 0000000000..88f99cab9b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json @@ -0,0 +1,19 @@ +{ + "condition": { + "structures": [ + "end_city" + ], + "neededBaseBlocks": [ + "minecraft:end_stone_bricks", + "minecraft:purpur_block", + "minecraft:purpur_pillar" + ], + "neededNearbyBlocks": [ + "minecraft:end_stone_bricks", + "minecraft:purpur_block", + "minecraft:purpur_pillar", + "minecraft:purpur_slab", + "minecraft:purpur_stairs" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/freshwater.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/freshwater.json index dd70e9547d..f278a44a14 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/freshwater.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/freshwater.json @@ -1,8 +1,12 @@ { "condition": { - "biomes": [ "#cobblemon:is_freshwater" ] + "biomes": [ + "#cobblemon:is_freshwater" + ] }, "anticondition": { - "biomes": [ "#cobblemon:is_freezing" ] + "biomes": [ + "#cobblemon:is_freezing" + ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json new file mode 100644 index 0000000000..697ae4f43a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json @@ -0,0 +1,10 @@ +{ + "condition": { + "structures": [ + "pillager_outpost", + "swamp_hut", + "woodland_mansion" + ], + "minY": 62 + } +} diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json new file mode 100644 index 0000000000..8a50c7c656 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json @@ -0,0 +1,18 @@ +{ + "condition": { + "structures": [ + "jungle_pyramid" + ], + "minY": 62, + "neededBaseBlocks": [ + "#minecraft:cobblestone", + "#minecraft:mossy_cobblestone" + ], + "neededNearbyBlocks": [ + "minecraft:chiseled_stone_bricks", + "minecraft:cobblestone", + "minecraft:cobblestone_stairs", + "minecraft:mossy_cobblestone" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json new file mode 100644 index 0000000000..7811908b95 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json @@ -0,0 +1,10 @@ +{ + "condition": { + "structures": [ + "nether_fossil" + ], + "neededNearbyBlocks": [ + "minecraft:bone_block" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json new file mode 100644 index 0000000000..6b0481875e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json @@ -0,0 +1,30 @@ +{ + "condition": { + "structures": [ + "bastion_remnant", + "fortress" + ], + "neededBaseBlocks": [ + "minecraft:chiseled_polished_blackstone", + "minecraft:cracked_polished_blackstone_bricks", + "minecraft:gilded_blackstone", + "minecraft:nether_bricks", + "minecraft:polished_basalt", + "minecraft:polished_blackstone_bricks" + ], + "neededNearbyBlocks": [ + "minecraft:blackstone_slab", + "minecraft:blackstone_stairs", + "minecraft:blackstone_wall", + "minecraft:chiseled_polished_blackstone", + "minecraft:cracked_polished_blackstone_bricks", + "minecraft:gilded_blackstone", + "minecraft:nether_brick_fence", + "minecraft:nether_brick_stairs", + "minecraft:nether_bricks", + "minecraft:polished_basalt", + "minecraft:polished_blackstone_brick_stairs", + "minecraft:polished_blackstone_bricks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json new file mode 100644 index 0000000000..dc98dbfded --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json @@ -0,0 +1,13 @@ +{ + "condition": { + "structures": [ + "ocean_monument" + ], + "maxY": 62, + "neededNearbyBlocks": [ + "minecraft:dark_prismarine", + "minecraft:prismarine", + "minecraft:prismarine_bricks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json new file mode 100644 index 0000000000..0fe60748f9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json @@ -0,0 +1,18 @@ +{ + "condition": { + "structures": [ + "#ocean_ruin" + ], + "maxY": 62, + "neededNearbyBlocks": [ + "minecraft:chiseled_sandstone", + "minecraft:chiseled_stone_bricks", + "minecraft:cracked_stone_bricks", + "minecraft:cut_sandstone", + "minecraft:mossy_cobblestone", + "minecraft:mossy_stone_bricks", + "minecraft:polished_granite", + "minecraft:stone_bricks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json new file mode 100644 index 0000000000..85f8072029 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json @@ -0,0 +1,23 @@ +{ + "condition": { + "structures": [ + "pillager_outpost" + ], + "minY": 62, + "neededNearbyBlocks": [ + "minecraft:cobblestone", + "minecraft:cobblestone_slab", + "minecraft:cobblestone_stairs", + "minecraft:cobblestone_wall", + "minecraft:dark_oak_fence", + "minecraft:dark_oak_slab", + "minecraft:dark_oak_stairs", + "minecraft:mossy_cobblestone", + "minecraft:mossy_cobblestone_slab", + "minecraft:mossy_cobblestone_stairs", + "minecraft:mossy_cobblestone_wall", + "#minecraft:logs", + "#minecraft:planks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/river.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/river.json index ba42a9beea..0bb66c5a01 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/river.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/river.json @@ -1,8 +1,12 @@ { "condition": { - "biomes": [ "#cobblemon:is_river" ] + "biomes": [ + "#cobblemon:is_river" + ] }, "anticondition": { - "biomes": [ "#cobblemon:is_freezing" ] + "biomes": [ + "#cobblemon:is_freezing" + ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json new file mode 100644 index 0000000000..f478904df5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json @@ -0,0 +1,12 @@ +{ + "condition": { + "structures": [ + "#ruined_portal" + ], + "neededNearbyBlocks": [ + "minecraft:crying_obsidian", + "minecraft:netherack", + "minecraft:obsidian" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_structures.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_structures.json deleted file mode 100644 index 148a571f47..0000000000 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_structures.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "condition": { - "canSeeSky": false, - "neededBaseBlocks": [ - "minecraft:cracked_stone_bricks", - "minecraft:mossy_stone_bricks", - "minecraft:chiseled_stone_bricks", - "minecraft:mossy_cobblestone", - "minecraft:iron_bars" - ], - "biomes": [ - "#cobblemon:is_overworld" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } -} diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json new file mode 100644 index 0000000000..50dbd043a3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json @@ -0,0 +1,12 @@ +{ + "condition": { + "structures": [ + "#shipwreck" + ], + "maxY": 62, + "neededNearbyBlocks": [ + "#minecraft:logs", + "#minecraft:planks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json new file mode 100644 index 0000000000..7f3de5c4d1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json @@ -0,0 +1,15 @@ +{ + "condition": { + "structures": [ + "stronghold" + ], + "maxY": 62, + "neededBaseBlocks": [ + "#minecraft:stone_bricks" + ], + "neededNearbyBlocks": [ + "minecraft:cracked_stone_bricks", + "minecraft:mossy_stone_bricks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json new file mode 100644 index 0000000000..ec1e2bdbff --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json @@ -0,0 +1,58 @@ +{ + "condition": { + "structures": [ + "trail_ruins" + ], + "minY": 32, + "neededBaseBlocks": [ + "minecraft:black_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:bricks", + "minecraft:brown_glazed_terracotta", + "minecraft:cobblestone", + "minecraft:cyan_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:mud_bricks", + "minecraft:orange_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:stone", + "minecraft:stone_bricks", + "minecraft:suspicious_gravel", + "minecraft:white_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "#minecraft:convertable_to_mud", + "#minecraft:sand", + "#minecraft:terracotta", + "#minecraft:trail_ruins_replaceable" + ], + "neededNearbyBlocks": [ + "minecraft:black_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:bricks", + "minecraft:brown_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:mud_bricks", + "minecraft:orange_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:suspicious_gravel", + "minecraft:white_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "#minecraft:terracotta" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json index 2a7a489362..d4fbde9807 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json @@ -1,12 +1,9 @@ { "condition": { + "structures": [ + "#village" + ], "neededNearbyBlocks": [ - "minecraft:dirt_path", - "minecraft:cut_sandstone", - "minecraft:cut_red_sandstone", - "minecraft:bricks", - "minecraft:smooth_stone", - "minecraft:smooth_stone_slab", "minecraft:white_concrete", "minecraft:orange_concrete", "minecraft:magenta_concrete", @@ -24,5 +21,10 @@ "minecraft:red_concrete", "minecraft:black_concrete" ] + }, + "anticondition": { + "structures": [ + "trail_ruins" + ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json new file mode 100644 index 0000000000..bc44d86859 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json @@ -0,0 +1,22 @@ +{ + "condition": { + "structures": [ + "woodland_mansion" + ], + "minY": 62, + "neededBaseBlocks": [ + "minecraft:birch_planks", + "minecraft:double_smooth_stone_slab", + "minecraft:oak_planks", + "minecraft:polished_andesite", + "#minecraft:wool", + "#minecraft:wool_carpets" + ], + "neededNearbyBlocks": [ + "minecraft:birch_planks", + "minecraft:cobblestone_stairs", + "minecraft:cobblestone_wall", + "minecraft:dark_oak_planks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0004_charmander.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0004_charmander.json index 3bacc4ff20..a02eedfc44 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0004_charmander.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0004_charmander.json @@ -33,7 +33,7 @@ "weight": 9.0, "condition": { "biomes": [ - "minecraft:basalt_deltas" + "#cobblemon:is_nether_basalt" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0005_charmeleon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0005_charmeleon.json index 97da968647..f51ef092ba 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0005_charmeleon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0005_charmeleon.json @@ -33,7 +33,7 @@ "weight": 0.9, "condition": { "biomes": [ - "minecraft:basalt_deltas" + "#cobblemon:is_nether_basalt" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0006_charizard.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0006_charizard.json index b0a0fb8e98..12a9d39083 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0006_charizard.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0006_charizard.json @@ -33,7 +33,7 @@ "weight": 0.1, "condition": { "biomes": [ - "minecraft:basalt_deltas" + "#cobblemon:is_nether_basalt" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json index 1b8ae2e9cc..d710be68d6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json @@ -20,7 +20,8 @@ "biomes": [ "#cobblemon:is_temperate", "#cobblemon:is_sky" - ] + ], + "timeRange": "day" }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json index a45ca7a754..a684b9bb2e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json @@ -20,7 +20,8 @@ "biomes": [ "#cobblemon:is_temperate", "#cobblemon:is_sky" - ] + ], + "timeRange": "day" }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json index 1cf64ba627..cd96a23296 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json @@ -20,7 +20,8 @@ "biomes": [ "#cobblemon:is_temperate", "#cobblemon:is_sky" - ] + ], + "timeRange": "day" }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json index b4851efcf1..7657c6d7de 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0021_spearow.json @@ -21,7 +21,8 @@ "#cobblemon:is_badlands", "#cobblemon:is_savanna", "#cobblemon:is_sky" - ] + ], + "timeRange": "day" } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json index 54dda4a9eb..bc8731b72d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0022_fearow.json @@ -21,7 +21,8 @@ "#cobblemon:is_badlands", "#cobblemon:is_savanna", "#cobblemon:is_sky" - ] + ], + "timeRange": "day" } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json index ae04b19480..37a6e2c924 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0023_ekans.json @@ -124,7 +124,7 @@ "weight": 5.4, "condition": { "biomes": [ - "minecraft:soul_sand_valley" + "#cobblemon:is_nether_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0024_arbok.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0024_arbok.json index 877eab36fb..9d36b3c2e7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0024_arbok.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0024_arbok.json @@ -124,7 +124,7 @@ "weight": 0.6, "condition": { "biomes": [ - "minecraft:soul_sand_valley" + "#cobblemon:is_nether_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json index 4e4130457c..6c6e2da5ad 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "16-32", "weight": 0.18, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json index dac60a7ec3..90e621b6c3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "27-49", "weight": 0.02, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json index 068e3a0fe9..6281e6c9dd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0037_vulpix.json @@ -13,20 +13,47 @@ "context": "grounded", "bucket": "uncommon", "level": "5-30", - "weight": 9.9, + "weight": 5.4, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_taiga" - ], - "timeRange": "twilight" + ] }, "anticondition": { "biomes": [ "#cobblemon:is_freezing" ] } + }, + { + "id": "vulpix-2", + "pokemon": "vulpix", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] + } }, { "id": "vulpix-alolan-1", @@ -38,13 +65,35 @@ "context": "grounded", "bucket": "uncommon", "level": "5-30", - "weight": 9.9, + "weight": 5.4, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_snowy" - ], - "timeRange": "twilight" + ] + } + }, + { + "id": "vulpix-alolan-2", + "pokemon": "vulpix alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json index 5ac256214c..55465325fe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0038_ninetales.json @@ -13,20 +13,47 @@ "context": "grounded", "bucket": "uncommon", "level": "25-51", - "weight": 0.1, + "weight": 0.6, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_taiga" - ], - "timeRange": "twilight" + ] }, "anticondition": { "biomes": [ "#cobblemon:is_freezing" ] } + }, + { + "id": "ninetales-2", + "pokemon": "ninetales", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-51", + "weight": 0.2, + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] + } }, { "id": "ninetales-alolan-1", @@ -38,13 +65,35 @@ "context": "grounded", "bucket": "uncommon", "level": "25-51", - "weight": 0.1, + "weight": 0.6, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_snowy" - ], - "timeRange": "twilight" + ] + } + }, + { + "id": "ninetales-alolan-2", + "pokemon": "ninetales alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-51", + "weight": 0.2, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json index ad3871c439..064e442cf7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "16-27", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -32,6 +38,12 @@ "bucket": "common", "level": "16-27", "weight": 0.18, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json index 9132041baa..601f693d4a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "22-44", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -32,6 +38,12 @@ "bucket": "common", "level": "22-44", "weight": 0.02, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json index d00b51e469..b309ad8173 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json @@ -44,6 +44,12 @@ "context": "grounded", "bucket": "common", "level": "5-24", + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "weight": 9.0, "condition": { "canSeeSky": false, @@ -68,6 +74,12 @@ "bucket": "uncommon", "level": "5-24", "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -91,6 +103,12 @@ "bucket": "common", "level": "5-24", "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json index 0e824a80ea..2515cd79e7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json @@ -45,6 +45,12 @@ "bucket": "common", "level": "22-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -68,6 +74,12 @@ "bucket": "uncommon", "level": "22-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -91,6 +103,12 @@ "bucket": "common", "level": "22-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json index 66cab0ce4b..32ae6bda20 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0043_oddish.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "7-32", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -32,6 +38,12 @@ "bucket": "common", "level": "7-32", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -50,6 +62,12 @@ "bucket": "common", "level": "7-32", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json index 9d28f7d7f3..1cccc1fb1d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0044_gloom.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "21-40", "weight": 0.9, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -32,6 +38,12 @@ "bucket": "common", "level": "21-40", "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -50,6 +62,12 @@ "bucket": "common", "level": "21-40", "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json index 2a8769b53c..15acd6bfd7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0046_paras.json @@ -37,6 +37,28 @@ "#cobblemon:is_mushroom" ] } + }, + { + "id": "paras-3", + "pokemon": "paras", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_fungus" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json index 7df7665614..a4d45330c2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0047_parasect.json @@ -37,6 +37,28 @@ "#cobblemon:is_mushroom" ] } + }, + { + "id": "parasect-3", + "pokemon": "parasect", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-41", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_fungus" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json index a00fad5adc..b0fbf93f41 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json @@ -12,20 +12,52 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "4-29", "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" ], - "timeRange": "night", "isRaining": false }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_arid", + "#cobblemon:is_freezing", + "#cobblemon:is_taiga" + ] + } + }, + { + "id": "meowth-2", + "pokemon": "meowth", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_arid" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json index 2013d6a15f..bb155f5e97 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json @@ -12,20 +12,52 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "28-44", "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" ], - "timeRange": "night", "isRaining": false }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_arid", + "#cobblemon:is_freezing", + "#cobblemon:is_taiga" + ] + } + }, + { + "id": "persian-2", + "pokemon": "persian", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-44", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_arid" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json index ce478c2787..a1fcd44bca 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json @@ -12,21 +12,18 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "10-35", - "weight": 5.94, + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest", - "#cobblemon:is_grassland", - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" + "#cobblemon:is_overworld" ] }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json index 7b12b29468..de023f8f00 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json @@ -12,21 +12,18 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "30-56", - "weight": 0.06, + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest", - "#cobblemon:is_grassland", - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" + "#cobblemon:is_overworld" ] }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json index 58bc9d0c50..c2a9aac72d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0063_abra.json @@ -21,6 +21,48 @@ "#cobblemon:is_temperate" ], "timeRange": "night" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_magical" + ] + } + }, + { + "id": "abra-2", + "pokemon": "abra", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_magical" + ], + "timeRange": "night" + } + }, + { + "id": "abra-3", + "pokemon": "abra", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0064_kadabra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0064_kadabra.json index 74c5b31b93..99c88f2572 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0064_kadabra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0064_kadabra.json @@ -21,6 +21,48 @@ "#cobblemon:is_temperate" ], "timeRange": "night" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_magical" + ] + } + }, + { + "id": "kadabra-2", + "pokemon": "kadabra", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-40", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_magical" + ], + "timeRange": "night" + } + }, + { + "id": "kadabra-3", + "pokemon": "kadabra", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-40", + "weight": 0.18, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json index f909055512..3b70d48947 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0065_alakazam.json @@ -21,6 +21,48 @@ "#cobblemon:is_temperate" ], "timeRange": "night" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_magical" + ] + } + }, + { + "id": "alakazam-2", + "pokemon": "alakazam", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "35-50", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_magical" + ], + "timeRange": "night" + } + }, + { + "id": "alakazam-3", + "pokemon": "alakazam", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-50", + "weight": 0.02, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json index adaf29e5dc..8cd81688ef 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0066_machop.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "6-31", "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json index b32632c0a7..10a9dff40d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0067_machoke.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "28-41", "weight": 0.54, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json index e356224c68..90962b51a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0068_machamp.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "36-51", "weight": 0.06, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json index aa2a976d01..ad40b7d512 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json @@ -19,7 +19,7 @@ "biomes": [ "#cobblemon:is_deep" ], - "maxHeight": 48 + "maxY": 48 } }, { @@ -36,9 +36,9 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ], - "maxHeight": 48 + "maxY": 48 }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json index 48fe90bada..3362a593b6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json @@ -19,7 +19,7 @@ "biomes": [ "#cobblemon:is_deep" ], - "maxHeight": 48 + "maxY": 48 } }, { @@ -36,9 +36,9 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ], - "maxHeight": 48 + "maxY": 48 }, "anticondition": { "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json index 5db109b992..d3d10d0659 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "16-41", "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -30,12 +36,13 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "16-41", "weight": 5.4, "condition": { "biomes": [ - "minecraft:nether_wastes" + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json index a92c13d1d1..8ad0414ee0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "40-50", "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -30,12 +36,13 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "40-50", "weight": 0.6, "condition": { "biomes": [ - "minecraft:nether_wastes" + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json index d08b7d55a9..ee6798427e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json @@ -11,7 +11,7 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "8-33", "weight": 9.0, "condition": { @@ -24,6 +24,30 @@ "#cobblemon:is_abyss" ] } + }, + { + "id": "magnemite-2", + "pokemon": "magnemite", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json index 9d24d48803..d52a0046d9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json @@ -11,7 +11,7 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "30-47", "weight": 0.9, "condition": { @@ -24,6 +24,30 @@ "#cobblemon:is_abyss" ] } + }, + { + "id": "magneton-2", + "pokemon": "magneton", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-47", + "weight": 0.9, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json index 88cae07917..4f2089e22b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json @@ -15,6 +15,12 @@ "bucket": "uncommon", "level": "13-38", "weight": 10.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json index 02bdfe55ae..f04d91f57e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "6-31", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json index 298efb98dc..215c932166 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "31-47", "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json index b082322488..d2693f2c0e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json @@ -7,19 +7,67 @@ "id": "grimer-1", "pokemon": "grimer", "presets": [ - "natural" + "water_surface" ], "type": "pokemon", - "context": "grounded", + "context": "surface", "bucket": "common", "level": "8-33", "weight": 1.8, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_swamp" ] } + }, + { + "id": "grimer-2", + "pokemon": "grimer", + "presets": [ + "water_surface", + "urban" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "8-33", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "grimer-3", + "pokemon": "grimer", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_toxic" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json index c570e5606f..eef13bd3f0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json @@ -7,19 +7,67 @@ "id": "muk-1", "pokemon": "muk", "presets": [ - "natural" + "water_surface" ], "type": "pokemon", - "context": "grounded", + "context": "surface", "bucket": "common", "level": "38-50", "weight": 0.2, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_swamp" ] } + }, + { + "id": "muk-2", + "pokemon": "muk", + "presets": [ + "water_surface", + "urban" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "38-50", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "muk-3", + "pokemon": "muk", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-50", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_toxic" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json index 30e3e7892e..1926aac7fa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json @@ -13,7 +13,7 @@ "context": "seafloor", "bucket": "common", "level": "6-31", - "weight": 9.9, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ @@ -31,11 +31,11 @@ "context": "seafloor", "bucket": "common", "level": "6-31", - "weight": 5.94, + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json index 02e48a1d35..1835472071 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json @@ -13,7 +13,7 @@ "context": "seafloor", "bucket": "common", "level": "26-53", - "weight": 0.1, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ @@ -31,11 +31,11 @@ "context": "seafloor", "bucket": "common", "level": "26-53", - "weight": 0.06, + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json index 4d9b7fb0a7..10217b9a36 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0095_onix.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "14-39", - "weight": 5.94, + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ @@ -25,6 +25,23 @@ "#cobblemon:is_abyss" ] } + }, + { + "id": "onix-nether-1", + "pokemon": "onix", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "14-39", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_nether_basalt" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json index 165b4fc46d..ef67dd9d5b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json @@ -14,7 +14,7 @@ "context": "grounded", "bucket": "common", "level": "8-33", - "weight": 5.4, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json index 4b969af074..13ad784c74 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json @@ -14,7 +14,7 @@ "context": "grounded", "bucket": "common", "level": "26-48", - "weight": 0.6, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json index 9ab6cc7c2b..2539ae3d48 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json @@ -12,13 +12,43 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "8-33", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "voltorb-2", + "pokemon": "voltorb", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json index 62cf3f7e34..d9dff441c7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json @@ -12,13 +12,43 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "30-49", "weight": 0.2, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "electrode-2", + "pokemon": "electrode", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-49", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json index 97f9642983..363c5e29fc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "common", "level": "8-33", - "weight": 1.98, + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json index 4d9a5a1326..9ef27c912e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "common", "level": "28-53", - "weight": 0.02, + "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json index 1e4910c004..260a866506 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json @@ -20,6 +20,24 @@ "#cobblemon:is_sandy" ] } + }, + { + "id": "cubone-alolan-1", + "pokemon": "cubone", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "7-32", + "weight": 5.4, + "condition": { + "biomes": [ + "#cobblemon:is_nether_desert", + "#cobblemon:is_nether_soul_fire" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json index 9f2d5b09ef..15d5b4c88c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json @@ -20,6 +20,24 @@ "#cobblemon:is_sandy" ] } + }, + { + "id": "marowak-alolan-1", + "pokemon": "marowak", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-43", + "weight": 0.6, + "condition": { + "biomes": [ + "#cobblemon:is_nether_desert", + "#cobblemon:is_nether_soul_fire" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json index 675191dac1..0d826ab319 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0106_hitmonlee.json @@ -13,7 +13,13 @@ "context": "grounded", "bucket": "uncommon", "level": "20-46", - "weight": 0.02, + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json index e93be55fbf..cfc3aba43d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0107_hitmonchan.json @@ -13,7 +13,13 @@ "context": "grounded", "bucket": "uncommon", "level": "20-46", - "weight": 0.02, + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json index 5290dbca5d..ffd5cceb71 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0108_lickitung.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "14-39", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json index 3235e8f2b0..3b66d48fe2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json @@ -7,17 +7,41 @@ "id": "koffing-1", "pokemon": "koffing", "presets": [ - "natural" + "natural", + "urban" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "9-34", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_swamp" + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "koffing-2", + "pokemon": "koffing", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_toxic" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json index 8313e867a2..69d7f84269 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json @@ -7,17 +7,41 @@ "id": "weezing-1", "pokemon": "weezing", "presets": [ - "natural" + "natural", + "urban" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "35-49", "weight": 0.2, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_swamp" + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "weezing-2", + "pokemon": "weezing", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-49", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_toxic" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json index ca505e95ad..6ec11dbafd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "10-35", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json index e6872796f4..a2a6d84890 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "42-49", "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json index 60c45922ed..f86654846e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json @@ -15,6 +15,12 @@ "bucket": "rare", "level": "17-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json index 004c6a32fc..f08c3f074a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json @@ -14,6 +14,12 @@ "bucket": "rare", "level": "24-49", "weight": 10.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json index 68f609e3c8..fcc6e2b331 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "9-34", - "weight": 9.9, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ @@ -32,11 +32,17 @@ "context": "seafloor", "bucket": "uncommon", "level": "9-34", - "weight": 5.94, + "weight": 5.4, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json index 4023b7bb3e..42e33394d3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "29-52", - "weight": 0.1, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ @@ -32,11 +32,17 @@ "context": "seafloor", "bucket": "uncommon", "level": "29-52", - "weight": 0.06, + "weight": 0.6, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json index 7b77b339fb..88cba4fb74 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json @@ -14,18 +14,34 @@ "context": "grounded", "bucket": "uncommon", "level": "26-46", - "weight": 0.2, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_arid", - "#cobblemon:is_taiga", - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" ] }, "anticondition": { "biomes": [ - "#cobblemon:is_snowy" + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "mrmime-2", + "pokemon": "mrmime", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-46", + "weight": 0.2, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json index 2a9173847f..b8e2ab9c85 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "rare", "level": "25-50", - "weight": 1.98, + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ @@ -38,7 +38,7 @@ "context": "grounded", "bucket": "uncommon", "level": "25-50", - "weight": 1.98, + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json index a130369faa..297865518c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json @@ -14,12 +14,17 @@ "context": "grounded", "bucket": "uncommon", "level": "30-46", - "weight": 0.2, + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" + "#cobblemon:is_freezing" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json index 46d49d4b62..31c61254cf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0125_electabuzz.json @@ -11,37 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", - "level": "30-50", - "weight": 0.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains", - "#cobblemon:is_hills" - ], - "isThundering": true - } - }, - { - "id": "electabuzz-2", - "pokemon": "electabuzz", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "30-50", "weight": 0.18, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_plains", "#cobblemon:is_hills" - ], - "neededNearbyBlocks": [ - "minecraft:lightning_rod" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json index 6c1ebbbb02..83d5ffd638 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0126_magmar.json @@ -21,7 +21,8 @@ ], "isRaining": false, "neededNearbyBlocks": [ - "minecraft:lava", "minecraft:flowing_lava" + "#minecraft:lava", + "minecraft:magma_block" ] }, "anticondition": { @@ -57,14 +58,13 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "30-50", "weight": 0.9, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:crimson_forest", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt", + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json index 3367c15511..f56625dfa8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "24-49", "weight": 2.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json index da49066c55..24e44b5a44 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json @@ -48,7 +48,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } }, @@ -65,7 +65,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json index bfea1140b4..cfbe7d9fe5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json @@ -48,7 +48,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } }, @@ -65,7 +65,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json index 1faa7cc37e..d376339c41 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json @@ -33,7 +33,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] }, "anticondition": { 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 ac2b3eaa52..255815a496 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 @@ -13,8 +13,45 @@ "context": "grounded", "bucket": "rare", "level": "4-29", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "ditto-2", + "pokemon": "ditto", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "4-29", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "ditto-3", + "pokemon": "ditto", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "4-29", "weight": 10.0, "condition": { + "canSeeSky": false, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json index 070132efc8..ccceb28213 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json @@ -19,6 +19,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_temperate" + ] } }, { @@ -38,6 +43,43 @@ "#cobblemon:is_temperate" ] } + }, + { + "id": "eevee-3", + "pokemon": "eevee", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-33", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "eevee-4", + "pokemon": "eevee", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-33", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json index 1cf6bbf33b..94fcbc934c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json @@ -34,6 +34,43 @@ "condition": { "canSeeSky": true } + }, + { + "id": "vaporeon-3", + "pokemon": "vaporeon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "vaporeon-4", + "pokemon": "vaporeon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json index 7f4bde3862..54e2cf7134 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json @@ -20,6 +20,43 @@ "#cobblemon:is_grassland" ] } + }, + { + "id": "jolteon-2", + "pokemon": "jolteon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "jolteon-3", + "pokemon": "jolteon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json index d646bbaa25..ec70c237cb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json @@ -20,6 +20,43 @@ "#cobblemon:is_sandy" ] } + }, + { + "id": "flareon-2", + "pokemon": "flareon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "flareon-3", + "pokemon": "flareon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json index 14c9b1fdcc..874c323ad8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json @@ -39,6 +39,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "dratini-3", + "pokemon": "dratini", + "presets": [ + "underwater", + "ocean_ruins" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "5-30", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_ocean" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json index cec7ced95c..fabe6ec8f9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json @@ -39,6 +39,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "dragonair-3", + "pokemon": "dragonair", + "presets": [ + "underwater", + "ocean_ruins" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "30-42", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_ocean" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json index aa9db2d2e4..7f77aabc8e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json @@ -43,6 +43,25 @@ ], "isRaining": true } + }, + { + "id": "dragonite-3", + "pokemon": "dragonite", + "presets": [ + "underwater", + "ocean_ruins" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "55-60", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_ocean" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json index d4e17cf72f..6a4cb212e2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json @@ -45,6 +45,12 @@ "bucket": "common", "level": "45-53", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -68,6 +74,12 @@ "bucket": "uncommon", "level": "45-53", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -91,6 +103,12 @@ "bucket": "common", "level": "45-53", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json index cb305dc3a8..e06130b444 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0172_pichu.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "1-21", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json index e5048b7a58..4a6ce1334e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "1-21", "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -32,6 +38,12 @@ "bucket": "common", "level": "1-21", "weight": 1.8, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json index e24fca275c..dc569475d1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0177_natu.json @@ -12,9 +12,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "7-32", - "weight": 9.0, + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ @@ -23,6 +23,25 @@ ], "timeRange": "day" } + }, + { + "id": "natu-2", + "pokemon": "natu", + "presets": [ + "trail_ruins" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "7-32", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0178_xatu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0178_xatu.json index fabeb7260d..035b1aefb3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0178_xatu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0178_xatu.json @@ -12,9 +12,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "25-47", - "weight": 1.0, + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ @@ -23,6 +23,25 @@ ], "timeRange": "day" } + }, + { + "id": "xatu-2", + "pokemon": "xatu", + "presets": [ + "trail_ruins" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-47", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json deleted file mode 100644 index b029214671..0000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "wooper-1", - "pokemon": "wooper", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-21", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ], - "isRaining": true - } - }, - { - "id": "wooper-2", - "pokemon": "wooper", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "1-21", - "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/0195_quagsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json deleted file mode 100644 index 46e98d7772..0000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "quagsire-1", - "pokemon": "quagsire", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "20-43", - "weight": 1.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ], - "isRaining": true - } - }, - { - "id": "quagsire-2", - "pokemon": "quagsire", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "20-43", - "weight": 1.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/0196_espeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json index 79ddd8629a..8fc19a6e8d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json @@ -20,6 +20,43 @@ "#cobblemon:is_hills" ] } + }, + { + "id": "espeon-2", + "pokemon": "espeon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "espeon-3", + "pokemon": "espeon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json index 5d71e065d8..704f9a10ad 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json @@ -20,6 +20,43 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "umbreon-2", + "pokemon": "umbreon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "umbreon-3", + "pokemon": "umbreon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json index c4898bb207..f738c2066a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json @@ -12,13 +12,12 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "16-41", - "weight": 1.98, + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_sky", "#cobblemon:is_swamp", "#cobblemon:is_taiga" ], @@ -36,13 +35,39 @@ "context": "grounded", "bucket": "common", "level": "16-41", - "weight": 1.98, + "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_spooky" ] } + }, + { + "id": "murkrow-3", + "pokemon": "murkrow", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-41", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "night" + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json index 285b00f948..666c3dccdf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "common", "level": "19-44", - "weight": 1.98, + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ @@ -30,9 +30,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "19-44", - "weight": 5.94, + "weight": 1.8, "condition": { "canSeeSky": false, "biomes": [ @@ -49,9 +49,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "19-44", - "weight": 5.94, + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ @@ -70,7 +70,7 @@ "context": "grounded", "bucket": "common", "level": "19-44", - "weight": 1.98, + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ @@ -89,10 +89,10 @@ "context": "grounded", "bucket": "common", "level": "19-44", - "weight": 1.98, + "weight": 5.4, "condition": { "biomes": [ - "minecraft:warped_forest" + "#cobblemon:is_nether_warped" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json index c553ddab92..0c7cb3aa82 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0205_forretress.json @@ -20,6 +20,24 @@ "#cobblemon:is_taiga" ] } + }, + { + "id": "forretress-shulker-1", + "pokemon": "forretress shulker", + "presets": [ + "natural", + "end_city" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "31-47", + "weight": 2.0, + "condition": { + "biomes": [ + "#minecraft:is_end" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json index e5e36b174f..4e1fb5bd67 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0208_steelix.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "34-51", - "weight": 0.06, + "weight": 0.6, "condition": { "canSeeSky": false, "biomes": [ @@ -25,6 +25,23 @@ "#cobblemon:is_abyss" ] } + }, + { + "id": "steelix-nether-1", + "pokemon": "steelix", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "34-51", + "weight": 0.2, + "condition": { + "biomes": [ + "#cobblemon:is_nether_basalt" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json index fb7ad58977..b597b53ffc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "45-50", - "weight": 0.02, + "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json index 6677ad2da7..6229a3cfe7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "18-43", - "weight": 9.9, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json index 09e6213507..cbc7a589e4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json @@ -13,11 +13,11 @@ "context": "grounded", "bucket": "common", "level": "1-25", - "weight": 1.8, + "weight": 5.4, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt", + "#cobblemon:is_nether_wasteland" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json index 2645df39cc..499a9768ec 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json @@ -13,11 +13,11 @@ "context": "grounded", "bucket": "common", "level": "38-43", - "weight": 0.2, + "weight": 0.6, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt", + "#cobblemon:is_nether_wasteland" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json index e6763f3806..74b87609f1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "22-47", "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json index b9be4d70c1..fb9110109d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0236_tyrogue.json @@ -13,7 +13,13 @@ "context": "grounded", "bucket": "uncommon", "level": "1-21", - "weight": 1.98, + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json index 094a7e81ff..d98ca1a37d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0237_hitmontop.json @@ -13,7 +13,13 @@ "context": "grounded", "bucket": "uncommon", "level": "20-46", - "weight": 0.02, + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json index 293950769d..0df5408656 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json @@ -14,12 +14,17 @@ "context": "grounded", "bucket": "uncommon", "level": "6-31", - "weight": 1.8, + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" + "#cobblemon:is_freezing" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json index 14883b1d21..931e9c02b1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0239_elekid.json @@ -11,37 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", - "level": "11-36", - "weight": 9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains", - "#cobblemon:is_hills" - ], - "isThundering": true - } - }, - { - "id": "elekid-2", - "pokemon": "elekid", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "11-36", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_plains", "#cobblemon:is_hills" - ], - "neededNearbyBlocks": [ - "minecraft:lightning_rod" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json index f60f645eb5..191cd9f5f1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0240_magby.json @@ -21,7 +21,8 @@ ], "isRaining": false, "neededNearbyBlocks": [ - "minecraft:lava", "minecraft:flowing_lava" + "#minecraft:lava", + "minecraft:magma_block" ] }, "anticondition": { @@ -57,14 +58,13 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "11-36", "weight": 9.0, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:crimson_forest", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt", + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json index 04861681f3..b67cb60d42 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json @@ -15,6 +15,12 @@ "bucket": "rare", "level": "40-54", "weight": 0.1, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json index 9595b8207e..841f891c27 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0293_whismur.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "1-24", - "weight": 5.4, + "weight": 9.0, "condition": { "canSeeSky": false, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json index 30ecdbaf8d..9fc1709d72 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0294_loudred.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "20-39", - "weight": 0.54, + "weight": 0.9, "condition": { "canSeeSky": false, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json index 5bba0b7a4f..7fc7b6df6a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0295_exploud.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "40-49", - "weight": 0.06, + "weight": 0.1, "condition": { "canSeeSky": false, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json index d5722ad0a6..eddcb2bbd4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0299_nosepass.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "13-38", - "weight": 5.94, + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json index 1ef02c30b7..c364233738 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0311_plusle.json @@ -11,15 +11,45 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "rare", + "bucket": "uncommon", "level": "16-41", - "weight": 5.0, + "weight": 1.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_plains" ] } + }, + { + "id": "plusle-2", + "pokemon": "plusle", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-41", + "weight": 3.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json index 208f834bbe..c842ac8735 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0312_minun.json @@ -11,15 +11,45 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "rare", + "bucket": "uncommon", "level": "16-41", - "weight": 5.0, + "weight": 1.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_plains" ] } + }, + { + "id": "minun-2", + "pokemon": "minun", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-41", + "weight": 3.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json index 519c171791..a0ce3ec3cd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json index f5684b00ae..e9381e7e88 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json index cd61c70a48..31a8e7d684 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json @@ -11,23 +11,6 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "22-47", - "weight": 10.0, - "condition": { - "biomes": [ - "minecraft:basalt_deltas" - ] - } - }, - { - "id": "torkoal-2", - "pokemon": "torkoal", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", "bucket": "common", "level": "22-47", "weight": 10.0, @@ -42,7 +25,7 @@ } }, { - "id": "torkoal-3", + "id": "torkoal-2", "pokemon": "torkoal", "presets": [ "natural" @@ -68,6 +51,23 @@ "#cobblemon:is_thermal" ] } + }, + { + "id": "torkoal-3", + "pokemon": "torkoal", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-47", + "weight": 2.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_basalt" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json index 6b8ab93e4e..19ad4c16ca 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json @@ -18,13 +18,33 @@ "canSeeSky": false, "biomes": [ "#cobblemon:is_sandy" - ] + ], + "minY": 0 }, "anticondition": { "biomes": [ "#cobblemon:is_abyss" ] } + }, + { + "id": "baltoy-2", + "pokemon": "baltoy", + "presets": [ + "natural", + "desert_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json index bc933634b5..2c887394cc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json @@ -18,13 +18,33 @@ "canSeeSky": false, "biomes": [ "#cobblemon:is_sandy" - ] + ], + "minY": 0 }, "anticondition": { "biomes": [ "#cobblemon:is_abyss" ] } + }, + { + "id": "claydol-2", + "pokemon": "claydol", + "presets": [ + "natural", + "desert_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "36-50", + "weight": 0.6, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0390_chimchar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0390_chimchar.json index 805fb60653..d0b45d56f3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0390_chimchar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0390_chimchar.json @@ -16,12 +16,14 @@ "level": "5-31", "weight": 9.0, "condition": { + "canSeeSky": true, "biomes": [ - "minecraft:crimson_forest" - ] + "#cobblemon:is_mountain" + ], + "isRaining": false } }, - { + { "id": "chimchar-2", "pokemon": "chimchar", "presets": [ @@ -34,11 +36,9 @@ "level": "5-31", "weight": 9.0, "condition": { - "canSeeSky": true, "biomes": [ - "#cobblemon:is_mountain" - ], - "isRaining": false + "#cobblemon:is_nether_forest" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json index 39881f249f..699ffc7f6c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0391_monferno.json @@ -16,12 +16,14 @@ "level": "14-41", "weight": 0.9, "condition": { + "canSeeSky": true, "biomes": [ - "minecraft:crimson_forest" - ] + "#cobblemon:is_mountain" + ], + "isRaining": false } }, - { + { "id": "monferno-2", "pokemon": "monferno", "presets": [ @@ -34,11 +36,9 @@ "level": "14-41", "weight": 0.9, "condition": { - "canSeeSky": true, "biomes": [ - "#cobblemon:is_mountain" - ], - "isRaining": false + "#cobblemon:is_nether_forest" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0392_infernape.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0392_infernape.json index 26b9ef5ea6..e9951c0f26 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0392_infernape.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0392_infernape.json @@ -16,12 +16,14 @@ "level": "36-53", "weight": 0.1, "condition": { + "canSeeSky": true, "biomes": [ - "minecraft:crimson_forest" - ] + "#cobblemon:is_mountain" + ], + "isRaining": false } }, - { + { "id": "infernape-2", "pokemon": "infernape", "presets": [ @@ -34,11 +36,9 @@ "level": "36-53", "weight": 0.1, "condition": { - "canSeeSky": true, "biomes": [ - "#cobblemon:is_mountain" - ], - "isRaining": false + "#cobblemon:is_nether_forest" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json index d46ac32477..f9e0097c9a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json @@ -15,6 +15,12 @@ "bucket": "uncommon", "level": "16-40", "weight": 10.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json index 6da3124e73..d24f715075 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "common", "level": "10-35", - "weight": 9.9, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json index 52af01c5e0..dcb24b638c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "common", "level": "30-48", - "weight": 0.1, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json index 4ab021de11..f88ff18d13 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "common", "level": "39-50", - "weight": 0.02, + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ @@ -30,9 +30,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "39-50", - "weight": 0.06, + "weight": 0.2, "condition": { "canSeeSky": false, "biomes": [ @@ -49,9 +49,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "39-50", - "weight": 0.06, + "weight": 0.6, "condition": { "canSeeSky": false, "biomes": [ @@ -70,7 +70,7 @@ "context": "grounded", "bucket": "common", "level": "39-50", - "weight": 0.02, + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ @@ -89,10 +89,10 @@ "context": "grounded", "bucket": "common", "level": "39-50", - "weight": 0.02, + "weight": 0.6, "condition": { "biomes": [ - "minecraft:warped_forest" + "#cobblemon:is_nether_warped" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json index 7729b526ad..941a01f4cf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json @@ -12,13 +12,12 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "36-51", - "weight": 0.02, + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_sky", "#cobblemon:is_swamp", "#cobblemon:is_taiga" ], @@ -36,13 +35,39 @@ "context": "grounded", "bucket": "common", "level": "36-51", - "weight": 0.02, + "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_spooky" ] } + }, + { + "id": "honchkrow-3", + "pokemon": "honchkrow", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "36-51", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "night" + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json index c24d4641df..71e6d57bb2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json @@ -14,13 +14,11 @@ "context": "grounded", "bucket": "uncommon", "level": "6-31", - "weight": 1.8, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_arid", - "#cobblemon:is_taiga", - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" ] }, "anticondition": { @@ -28,6 +26,24 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "mimejr-2", + "pokemon": "mimejr", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json index ea37e03ff7..0d9a588dc9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json @@ -15,6 +15,12 @@ "bucket": "rare", "level": "1-22", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json index d5122f666c..dc5373b3dd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json @@ -7,31 +7,25 @@ "id": "spiritomb-1", "pokemon": "spiritomb", "presets": [ - "natural" + "ancient_city" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", "level": "24-49", - "weight": 20.0, + "weight": 6.0, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_abyss" - ], - "neededNearbyBlocks": [ - "minecraft:deepslate_bricks", - "minecraft:cracked_deepslate_bricks", - "minecraft:deepslate_tiles", - "minecraft:polished_deepslate" ] } }, - { + { "id": "spiritomb-2", "pokemon": "spiritomb", - "presets": [ - "ruined_structures" + "presets": [ + "trail_ruins" ], "type": "pokemon", "context": "grounded", @@ -39,7 +33,29 @@ "level": "24-49", "weight": 10.0, "condition": { - "canSeeSky": false + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "spiritomb-3", + "pokemon": "spiritomb", + "presets": [ + "natural", + "desert_pyramid", + "jungle_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "24-49", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json index 71153d5b39..34bddfe092 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json @@ -14,6 +14,12 @@ "bucket": "rare", "level": "4-29", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json index b70ca86697..f260171619 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json @@ -14,6 +14,12 @@ "bucket": "rare", "level": "24-53", "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json index 2261d1cf25..a6f75be24c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json @@ -10,7 +10,7 @@ "context": "grounded", "bucket": "uncommon", "level": "38-51", - "weight": 0.1, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json index 08d8707615..9b67a154d6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json @@ -11,7 +11,7 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "42-54", "weight": 0.1, "condition": { @@ -24,6 +24,30 @@ "#cobblemon:is_abyss" ] } + }, + { + "id": "magnezone-2", + "pokemon": "magnezone", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "42-54", + "weight": 0.1, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:lightning_rod" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json index 7167abc9a5..bc9510fc19 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0463_lickilicky.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "34-52", "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json index f0bc41779f..2af0944454 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "44-54", "weight": 0.02, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json index 10bf46786b..c0b52e3fbc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0466_electivire.json @@ -11,37 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", - "level": "45-54", - "weight": 0.1, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains", - "#cobblemon:is_hills" - ], - "isThundering": true - } - }, - { - "id": "electivire-2", - "pokemon": "electivire", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", + "bucket": "uncommon", "level": "45-54", "weight": 0.02, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_plains", "#cobblemon:is_hills" - ], - "neededNearbyBlocks": [ - "minecraft:lightning_rod" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json index 1732e26935..950a51cb9c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0467_magmortar.json @@ -21,13 +21,22 @@ ], "isRaining": false, "neededNearbyBlocks": [ - "minecraft:lava", "minecraft:flowing_lava" + "#minecraft:lava", + "minecraft:magma_block" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_volcanic" ] } }, { "id": "magmortar-2", "pokemon": "magmortar", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", "bucket": "common", @@ -44,16 +53,18 @@ { "id": "magmortar-3", "pokemon": "magmortar", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "45-54", "weight": 0.1, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:crimson_forest", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt", + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json index f508fedf29..3ddc4b7a0c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json @@ -27,6 +27,43 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "leafeon-2", + "pokemon": "leafeon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "leafeon-3", + "pokemon": "leafeon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json index ef787d1994..910fc42b0e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json @@ -20,6 +20,43 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "glaceon-2", + "pokemon": "glaceon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "glaceon-3", + "pokemon": "glaceon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json index 4d53b88e0d..ca7b59be41 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "33-53", - "weight": 0.06, + "weight": 0.6, "condition": { "canSeeSky": false, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0498_tepig.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0498_tepig.json index a0eb1812b5..130264408f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0498_tepig.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0498_tepig.json @@ -15,12 +15,13 @@ "level": "5-31", "weight": 9.0, "condition": { - "biomes": [ - "minecraft:crimson_forest" + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" ] - } + } }, - { + { "id": "tepig-2", "pokemon": "tepig", "presets": [ @@ -32,12 +33,11 @@ "level": "5-31", "weight": 9.0, "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ], - "isRaining": false - } + "biomes": [ + "#cobblemon:is_nether_crimson", + "#cobblemon:is_nether_overgrowth" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0499_pignite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0499_pignite.json index bce6fb9b63..ea081ec797 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0499_pignite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0499_pignite.json @@ -3,7 +3,7 @@ "neededInstalledMods": [], "neededUninstalledMods": [], "spawns": [ - { + { "id": "pignite-1", "pokemon": "pignite", "presets": [ @@ -15,12 +15,13 @@ "level": "17-42", "weight": 0.9, "condition": { - "biomes": [ - "minecraft:crimson_forest" + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" ] - } + } }, - { + { "id": "pignite-2", "pokemon": "pignite", "presets": [ @@ -32,12 +33,11 @@ "level": "17-42", "weight": 0.9, "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ], - "isRaining": false - } + "biomes": [ + "#cobblemon:is_nether_crimson", + "#cobblemon:is_nether_overgrowth" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0500_emboar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0500_emboar.json index 69a092572a..8b591e141c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0500_emboar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0500_emboar.json @@ -15,12 +15,14 @@ "level": "36-53", "weight": 0.1, "condition": { - "biomes": [ - "minecraft:crimson_forest" - ] - } + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "isRaining": false + } }, - { + { "id": "emboar-2", "pokemon": "emboar", "presets": [ @@ -32,12 +34,11 @@ "level": "36-53", "weight": 0.1, "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ], - "isRaining": false - } + "biomes": [ + "#cobblemon:is_nether_crimson", + "#cobblemon:is_nether_overgrowth" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0501_oshawott.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0501_oshawott.json index 837e07afb1..b0125c1f6f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0501_oshawott.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0501_oshawott.json @@ -20,24 +20,6 @@ "#cobblemon:is_coast" ] } - }, - { - "id": "oshawott-2", - "pokemon": "oshawott", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "5-31", - "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/0502_dewott.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0502_dewott.json index 0ab71412cd..e9f218fd5f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0502_dewott.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0502_dewott.json @@ -20,24 +20,6 @@ "#cobblemon:is_coast" ] } - }, - { - "id": "dewott-2", - "pokemon": "dewott", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "17-41", - "weight": 0.9, - "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/0503_samurott.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0503_samurott.json index 8b55ea77a0..4583e0b9e1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0503_samurott.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0503_samurott.json @@ -20,24 +20,6 @@ "#cobblemon:is_coast" ] } - }, - { - "id": "samurott-2", - "pokemon": "samurott", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "36-53", - "weight": 0.1, - "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/0561_sigilyph.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json index 4bdf151d66..a688fbc0fe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json @@ -7,36 +7,58 @@ "id": "sigilyph-1", "pokemon": "sigilyph", "presets": [ - "natural" + "natural", + "desert_pyramid", + "jungle_pyramid" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "24-49", - "weight": 2.0, + "weight": 6.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_desert" + "#cobblemon:is_overworld" ], - "neededNearbyBlocks": [ - "minecraft:chiseled_red_sandstone", - "minecraft:chiseled_sandstone", - "minecraft:cut_red_sandstone", - "minecraft:cut_red_sandstone_slab", - "minecraft:cut_sandstone", - "minecraft:cut_sandstone_slab", - "minecraft:red_sandstone_slab", - "minecraft:red_sandstone_stairs", - "minecraft:red_sandstone_wall", - "minecraft:sandstone_stairs", - "minecraft:sandstone_wall", - "minecraft:smooth_red_sandstone", - "minecraft:smooth_red_sandstone_slab", - "minecraft:smooth_red_sandstone_stairs", - "minecraft:smooth_sandstone", - "minecraft:smooth_sandstone_slab", - "minecraft:smooth_sandstone_stairs" + "structures": [ + "desert_well" + ] + } + }, + { + "id": "sigilyph-2", + "pokemon": "sigilyph", + "presets": [ + "trail_ruins" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 6.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "sigilyph-3", + "pokemon": "sigilyph", + "presets": [ + "natural", + "end_city" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-49", + "weight": 6.0, + "condition": { + "biomes": [ + "#minecraft:is_end" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json index a24ac4e21a..2e8461ddcc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "9-34", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json index 31524ccea8..44d85e6a77 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "34-48", "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json index 42905a1d7f..4f81107d7e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0587_emolga.json @@ -15,6 +15,12 @@ "bucket": "uncommon", "level": "18-43", "weight": 10.0, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json index 2e43f2cbd7..481417c348 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0615_cryogonal.json @@ -21,6 +21,23 @@ ], "isRaining": true } + }, + { + "id": "cryogonal-2", + "pokemon": "cryogonal", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "27-52", + "weight": 2.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json index fdc61106b1..8d9374d466 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0622_golett.json @@ -7,31 +7,25 @@ "id": "golett-1", "pokemon": "golett", "presets": [ - "natural" + "ancient_city" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", "level": "5-30", - "weight": 42.0, + "weight": 9.0, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_abyss" - ], - "neededNearbyBlocks": [ - "minecraft:deepslate_bricks", - "minecraft:cracked_deepslate_bricks", - "minecraft:deepslate_tiles", - "minecraft:polished_deepslate" ] } }, - { + { "id": "golett-2", "pokemon": "golett", - "presets": [ - "ruined_structures" + "presets": [ + "trail_ruins" ], "type": "pokemon", "context": "grounded", @@ -39,7 +33,28 @@ "level": "5-30", "weight": 1.8, "condition": { - "canSeeSky": false + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "golett-3", + "pokemon": "golett", + "presets": [ + "natural", + "desert_pyramid", + "jungle_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json index 10aa468572..4832d61929 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0623_golurk.json @@ -7,31 +7,25 @@ "id": "golurk-1", "pokemon": "golurk", "presets": [ - "natural" + "ancient_city" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", "level": "43-48", - "weight": 18.0, + "weight": 1.0, "condition": { "canSeeSky": false, "biomes": [ "#cobblemon:is_abyss" - ], - "neededNearbyBlocks": [ - "minecraft:deepslate_bricks", - "minecraft:cracked_deepslate_bricks", - "minecraft:deepslate_tiles", - "minecraft:polished_deepslate" ] } }, - { + { "id": "golurk-2", "pokemon": "golurk", - "presets": [ - "ruined_structures" + "presets": [ + "trail_ruins" ], "type": "pokemon", "context": "grounded", @@ -39,7 +33,28 @@ "level": "43-48", "weight": 0.2, "condition": { - "canSeeSky": false + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "golurk-3", + "pokemon": "golurk", + "presets": [ + "natural", + "desert_pyramid", + "jungle_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "43-48", + "weight": 0.2, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json index 65f38ca1da..7d3d4e21ab 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json @@ -14,6 +14,12 @@ "bucket": "uncommon", "level": "23-48", "weight": 10.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -30,12 +36,12 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "23-48", - "weight": 10.0, + "weight": 2.0, "condition": { "biomes": [ - "#minecraft:is_nether" + "#cobblemon:is_nether_mountain" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json index afd18b9954..d41d129586 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0632_durant.json @@ -23,7 +23,7 @@ } }, { - "id": "durant-1", + "id": "durant-2", "pokemon": "durant", "presets": [ "natural" @@ -42,19 +42,19 @@ } }, { - "id": "durant-2", + "id": "durant-3", "pokemon": "durant", "presets": [ "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "23-48", "weight": 10.0, "condition": { "biomes": [ - "#minecraft:is_nether" + "#cobblemon:is_nether_mountain" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json index d8ae624b74..c951407685 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json @@ -26,6 +26,43 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "sylveon-2", + "pokemon": "sylveon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "sylveon-3", + "pokemon": "sylveon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json index 1820adc4a1..2d53c8db36 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json @@ -24,6 +24,23 @@ "minecraft:carved_pumpkin" ] } + }, + { + "id": "pumpkaboo-2", + "pokemon": "pumpkaboo", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "9-34", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json index bc7d6b59ad..a2dfc1372a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0711_gourgeist.json @@ -23,6 +23,23 @@ "minecraft:carved_pumpkin" ] } + }, + { + "id": "gourgeist-2", + "pokemon": "gourgeist", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "29-49", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json index f7f7081d09..1a49137aff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0728_popplio.json @@ -20,24 +20,6 @@ "#cobblemon:is_coast" ] } - }, - { - "id": "popplio-2", - "pokemon": "popplio", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "5-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/0729_brionne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json index 1388c6975e..f6d56e9988 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0729_brionne.json @@ -20,24 +20,6 @@ "#cobblemon:is_coast" ] } - }, - { - "id": "brionne-2", - "pokemon": "brionne", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "17-42", - "weight": 0.9, - "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/0730_primarina.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0730_primarina.json index f690e9e3ae..18085b0990 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0730_primarina.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0730_primarina.json @@ -20,24 +20,6 @@ "#cobblemon:is_coast" ] } - }, - { - "id": "primarina-2", - "pokemon": "primarina", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "34-53", - "weight": 0.1, - "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/0761_bounsweet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0761_bounsweet.json index b9af41883e..9a4473aad8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0761_bounsweet.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0761_bounsweet.json @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 1.8, "condition": { "canSeeSky": true, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json index 2f45cd75cb..c000be67bd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json @@ -28,14 +28,14 @@ "underwater" ], "type": "pokemon", - "context": "submerged", + "context": "seafloor", "bucket": "common", "level": "16-41", "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] }, "anticondition": { @@ -51,7 +51,7 @@ "underwater" ], "type": "pokemon", - "context": "submerged", + "context": "seafloor", "bucket": "common", "level": "16-41", "weight": 10.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json index 2aecf60994..8d896f2e5c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json @@ -13,12 +13,30 @@ "context": "grounded", "bucket": "rare", "level": "23-48", - "weight": 4.0, + "weight": 10.0, "condition": { "biomes": [ "#cobblemon:is_spooky" ] } + }, + { + "id": "mimikyu-2", + "pokemon": "mimikyu", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "23-48", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json index a7b1fa00de..9b0789f644 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0781_dhelmise.json @@ -7,21 +7,18 @@ "id": "dhelmise-1", "pokemon": "dhelmise", "presets": [ - "underwater" + "underwater", + "shipwreck" ], "type": "pokemon", "context": "submerged", "bucket": "common", "level": "27-52", - "weight": 2.0, + "weight": 10.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" - ], - "neededNearbyBlocks": [ - "#minecraft:logs", - "#minecraft:planks" + "#cobblemon:is_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json index d812df75c1..95ed8bb3b3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "2-27", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json index d9979754a2..405d1d09a1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "24-49", "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json index c6bf891984..931623804e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json @@ -34,8 +34,24 @@ "weight": 5.4, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt" + ] + } + }, + { + "id": "sizzlipede-3", + "pokemon": "sizzlipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json index d711e82f25..d1abd5bee4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json @@ -34,8 +34,24 @@ "weight": 0.6, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt" + ] + } + }, + { + "id": "centiskorch-3", + "pokemon": "centiskorch", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-53", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_wasteland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json index 428c08ee31..231818cd6a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json @@ -10,7 +10,7 @@ "context": "grounded", "bucket": "common", "level": "2-27", - "weight": 9.9, + "weight": 9.0, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -27,7 +27,7 @@ "context": "grounded", "bucket": "uncommon", "level": "2-27", - "weight": 1.98, + "weight": 1.8, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -36,6 +36,29 @@ "minecraft:sugar_cane" ] } + }, + { + "id": "milcery-3", + "pokemon": "milcery", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:light_grey_carpet", + "minecraft:magenta_carpet", + "minecraft:white_carpet" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json index ac96e8d268..78700370ef 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json @@ -10,7 +10,7 @@ "context": "grounded", "bucket": "common", "level": "22-50", - "weight": 0.1, + "weight": 1.0, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -27,7 +27,7 @@ "context": "grounded", "bucket": "uncommon", "level": "22-50", - "weight": 0.02, + "weight": 0.2, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -36,6 +36,29 @@ "minecraft:sugar_cane" ] } + }, + { + "id": "alcremie-3", + "pokemon": "alcremie", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-50", + "weight": 0.2, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:light_grey_carpet", + "minecraft:magenta_carpet", + "minecraft:white_carpet" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json index e68f37a66a..7673f680ed 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "42-53", "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json index 3d1640fa6d..a32a76b27d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "rare", "level": "45-50", - "weight": 0.02, + "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json index 83b7549e6b..e603ae8ca4 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json @@ -1,7 +1,8 @@ { "replace": false, "values": [ - "minecraft:flower_forest", + "minecraft:cherry_grove", + "minecraft:flower_forest", "minecraft:meadow", "minecraft:sunflower_plains", { diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json index 5bdb214fa6..e9b7e34691 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json @@ -1,7 +1,8 @@ { "replace": false, "values": [ - "#minecraft:is_forest", + "minecraft:cherry_grove", + "#minecraft:is_forest", { "id": "terralith:alpha_islands", "required": false diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_basalt.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_basalt.json new file mode 100644 index 0000000000..85b95f62fe --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_basalt.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "minecraft:basalt_deltas", + { + "id": "incendium:ash_barrens", + "required": false + }, + { + "id": "incendium:volcanic_deltas", + "required": false + }, + { + "id": "incendium:withered_forest", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_crimson.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_crimson.json new file mode 100644 index 0000000000..1d6f783785 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_crimson.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "minecraft:crimson_forest", + { + "id": "betternether:crimson_glowing_woods", + "required": false + }, + { + "id": "betternether:crimson_pinewood", + "required": false + }, + { + "id": "betternether:nether_swampland", + "required": false + }, + { + "id": "betternether:nether_swampland_terraces", + "required": false + }, + { + "id": "byg:crimson_gardens", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_desert.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_desert.json new file mode 100644 index 0000000000..bb96380d24 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_desert.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "minecraft:soul_sand_valley", + { + "id": "betternether:gravel_desert", + "required": false + }, + { + "id": "byg:quartz_desert", + "required": false + }, + { + "id": "byg:warped_desert", + "required": false + }, + { + "id": "incendium:infernal_dunes", + "required": false + }, + { + "id": "incendium:weeping_valley", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_forest.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_forest.json new file mode 100644 index 0000000000..c65bdb90f7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_forest.json @@ -0,0 +1,25 @@ +{ + "replace": false, + "values": [ + { + "id": "betternether:nether_jungle", + "required": false + }, + { + "id": "betternether:nether_swampland", + "required": false + }, + { + "id": "betternether:nether_swampland_terraces", + "required": false + }, + { + "id": "byg:weeping_mire", + "required": false + }, + { + "id": "byg:withering_woods", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_frozen.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_frozen.json new file mode 100644 index 0000000000..951cf0a97f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_frozen.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "byg:subzero_hypogeal", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_fungus.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_fungus.json new file mode 100644 index 0000000000..f590ec6a96 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_fungus.json @@ -0,0 +1,51 @@ +{ + "replace": false, + "values": [ + "minecraft:crimson_forest", + "minecraft:warped_forest", + { + "id": "betternether:crimson_glowing_woods", + "required": false + }, + { + "id": "betternether:crimson_pinewood", + "required": false + }, + { + "id": "betternether:mushroom_forest", + "required": false + }, + { + "id": "betternether:mushroom_forest_edge", + "required": false + }, + { + "id": "betternether:old_fungiwoods", + "required": false + }, + { + "id": "betternether:old_warped_woods", + "required": false + }, + { + "id": "byg:crimson_gardens", + "required": false + }, + { + "id": "byg:embur_bog", + "required": false + }, + { + "id": "byg:glowstone_garden", + "required": false + }, + { + "id": "byg:wailing_garth", + "required": false + }, + { + "id": "incendium:inverted_forest", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_mountain.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_mountain.json new file mode 100644 index 0000000000..6cbe6ad370 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_mountain.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:basalt_deltas", + { + "id": "incendium:volcanic_deltas", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_overgrowth.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_overgrowth.json new file mode 100644 index 0000000000..5f088f2d9f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_overgrowth.json @@ -0,0 +1,25 @@ +{ + "replace": false, + "values": [ + { + "id": "betternether:bone_reef", + "required": false + }, + { + "id": "betternether:nether_grasslands", + "required": false + }, + { + "id": "betternether:soul_plain", + "required": false + }, + { + "id": "betternether:sulfuric_bone_reef", + "required": false + }, + { + "id": "byg:sythian_torrids", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_quartz.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_quartz.json new file mode 100644 index 0000000000..1a4c18b910 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_quartz.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "byg:quartz_desert", + "required": false + }, + { + "id": "incendium:quartz_flats", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_fire.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_fire.json new file mode 100644 index 0000000000..da6d59ee71 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_fire.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "minecraft:soul_sand_valley", + { + "id": "byg:subzero_hypogeal", + "required": false + }, + { + "id": "byg:warped_desert", + "required": false + }, + { + "id": "incendium:quartz_flats", + "required": false + }, + { + "id": "incendium:weeping_valley", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_sand.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_sand.json new file mode 100644 index 0000000000..bcfa792c02 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_soul_sand.json @@ -0,0 +1,30 @@ +{ + "replace": false, + "values": [ + "minecraft:soul_sand_valley", + { + "id": "betternether:soul_plain", + "required": false + }, + { + "id": "betternether:wart_forest", + "required": false + }, + { + "id": "betternether:wart_forest_edge", + "required": false + }, + { + "id": "byg:wailing_garth", + "required": false + }, + { + "id": "byg:warped_desert", + "required": false + }, + { + "id": "incendium:weeping_valley", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_toxic.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_toxic.json new file mode 100644 index 0000000000..372dd4a991 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_toxic.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "byg:brimstone_caverns", + "required": false + }, + { + "id": "byg:wailing_garth", + "required": false + }, + { + "id": "incendium:toxic_heap", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_warped.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_warped.json new file mode 100644 index 0000000000..973b8523f9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_warped.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "minecraft:warped_forest", + { + "id": "betternether:nether_jungle", + "required": false + }, + { + "id": "betternether:old_warped_woods", + "required": false + }, + { + "id": "byg:wailing_garth", + "required": false + }, + { + "id": "byg:warped_desert", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_wasteland.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_wasteland.json new file mode 100644 index 0000000000..4776653252 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_nether_wasteland.json @@ -0,0 +1,30 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_wastes", + { + "id": "betternether:magma_land", + "required": false + }, + { + "id": "betternether:poor_nether_grasslands", + "required": false + }, + { + "id": "byg:brimstone_caverns", + "required": false + }, + { + "id": "byg:magma_wastes", + "required": false + }, + { + "id": "incendium:ash_barrens", + "required": false + }, + { + "id": "incendium:toxic_heap", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json new file mode 100644 index 0000000000..9645225bc4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:is_ocean", + "#cobblemon:is_coast", + } + ] +} \ No newline at end of file From c7cf73812c3be4b8ef23e3c162aa3e076c96c2ef Mon Sep 17 00:00:00 2001 From: tyzillion Date: Sun, 10 Sep 2023 18:56:28 -0400 Subject: [PATCH 03/40] Added spawns for many new pokemon, added biome based evos to Spewpa, and fixed issues. --- .../spawn_detail_presets/natural.json | 1 + .../spawn_pool_world/0129_magikarp.json | 4 +- .../spawn_pool_world/0152_chikorita.json | 26 + .../spawn_pool_world/0153_bayleef.json | 26 + .../spawn_pool_world/0154_meganium.json | 26 + .../spawn_pool_world/0155_cyndaquil.json | 30 ++ .../spawn_pool_world/0156_quilava.json | 30 ++ .../spawn_pool_world/0157_typlosion.json | 30 ++ .../spawn_pool_world/0158_totodile.json | 43 ++ .../spawn_pool_world/0159_croconaw.json | 43 ++ .../spawn_pool_world/0160_feraligatr.json | 43 ++ .../spawn_pool_world/0163_hoothoot.json | 30 ++ .../spawn_pool_world/0164_noctowl.json | 30 ++ .../spawn_pool_world/0167_spinarak.json | 100 ++++ .../spawn_pool_world/0168_ariados.json | 100 ++++ .../spawn_pool_world/0170_chinchou.json | 25 + .../spawn_pool_world/0171_lanturn.json | 25 + .../spawn_pool_world/0179_mareep.json | 40 ++ .../spawn_pool_world/0180_flaaffy.json | 40 ++ .../spawn_pool_world/0181_ampharos.json | 40 ++ .../spawn_pool_world/0190_aipom.json | 26 + .../spawn_pool_world/0194_wooper.json | 140 ++++++ .../spawn_pool_world/0195_quagsire.json | 136 ++++++ .../spawn_pool_world/0207_gligar.json | 40 ++ .../spawn_pool_world/0209_snubbull.json | 49 ++ .../spawn_pool_world/0210_granbull.json | 49 ++ .../spawn_pool_world/0213_shuckle.json | 25 + .../spawn_pool_world/0216_teddiursa.json | 26 + .../spawn_pool_world/0217_ursaring.json | 26 + .../spawn_pool_world/0231_phanpy.json | 55 +++ .../spawn_pool_world/0232_donphan.json | 55 +++ .../spawn_pool_world/0261_poochyena.json | 46 ++ .../spawn_pool_world/0262_mightyena.json | 46 ++ .../spawn_pool_world/0263_zigzagoon.json | 32 ++ .../spawn_pool_world/0264_linoone.json | 32 ++ .../spawn_pool_world/0276_tailow.json | 33 ++ .../spawn_pool_world/0277_swellow.json | 33 ++ .../spawn_pool_world/0278_wingull.json | 29 ++ .../spawn_pool_world/0279_pelipper.json | 29 ++ .../spawn_pool_world/0280_ralts.json | 64 +++ .../spawn_pool_world/0281_kirlia.json | 64 +++ .../spawn_pool_world/0282_gardevoir.json | 64 +++ .../spawn_pool_world/0283_surskit.json | 25 + .../spawn_pool_world/0284_masquerain.json | 25 + .../spawn_pool_world/0290_nincada.json | 32 ++ .../spawn_pool_world/0291_ninjask.json | 34 ++ .../spawn_pool_world/0292_shedinja.json | 34 ++ .../spawn_pool_world/0313_volbeat.json | 42 ++ .../spawn_pool_world/0314_illumise.json | 42 ++ .../spawn_pool_world/0322_numel.json | 68 +++ .../spawn_pool_world/0323_camerupt.json | 68 +++ .../spawn_pool_world/0331_cacnea.json | 31 ++ .../spawn_pool_world/0332_cacturne.json | 31 ++ .../spawn_pool_world/0339_barboach.json | 25 + .../spawn_pool_world/0340_whiscash.json | 25 + .../spawn_pool_world/0355_duskull.json | 57 +++ .../spawn_pool_world/0356_dusclops.json | 57 +++ .../spawn_pool_world/0358_chimecho.json | 42 ++ .../spawn_pool_world/0366_clamperl.json | 43 ++ .../spawn_pool_world/0367_huntail.json | 43 ++ .../spawn_pool_world/0368_gorebyss.json | 43 ++ .../spawn_pool_world/0369_relicanth.json | 66 +++ .../spawn_pool_world/0374_beldum.json | 42 ++ .../spawn_pool_world/0375_metang.json | 42 ++ .../spawn_pool_world/0376_metagross.json | 42 ++ .../spawn_pool_world/0396_starly.json | 35 ++ .../spawn_pool_world/0397_staravia.json | 35 ++ .../spawn_pool_world/0398_staraptor.json | 35 ++ .../spawn_pool_world/0403_shinx.json | 26 + .../spawn_pool_world/0404_luxio.json | 26 + .../spawn_pool_world/0405_luxray.json | 26 + .../spawn_pool_world/0415_combee.json | 35 ++ .../spawn_pool_world/0416_vespiquen.json | 35 ++ .../spawn_pool_world/0418_buizel.json | 55 +++ .../spawn_pool_world/0419_floatzel.json | 55 +++ .../spawn_pool_world/0424_ambipom.json | 26 + .../spawn_pool_world/0433_chingling.json | 48 ++ .../spawn_pool_world/0472_gliscor.json | 40 ++ .../spawn_pool_world/0475_gallade.json | 64 +++ .../spawn_pool_world/0477_dusknoir.json | 57 +++ .../spawn_pool_world/0504_patrat.json | 25 + .../spawn_pool_world/0505_watchog.json | 25 + .../spawn_pool_world/0506_lillipup.json | 31 ++ .../spawn_pool_world/0507_herdier.json | 31 ++ .../spawn_pool_world/0508_stoutland.json | 31 ++ .../spawn_pool_world/0519_pidove.json | 47 ++ .../spawn_pool_world/0520_tranquill.json | 47 ++ .../spawn_pool_world/0521_unfezant.json | 47 ++ .../spawn_pool_world/0524_roggenrola.json | 25 + .../spawn_pool_world/0525_boldore.json | 25 + .../spawn_pool_world/0526_gigalith.json | 25 + .../spawn_pool_world/0532_timburr.json | 32 ++ .../spawn_pool_world/0533_gurdurr.json | 32 ++ .../spawn_pool_world/0534_conkeldurr.json | 32 ++ .../spawn_pool_world/0543_venipede.json | 76 +++ .../spawn_pool_world/0544_whirlipede.json | 76 +++ .../spawn_pool_world/0545_scolipede.json | 76 +++ .../spawn_pool_world/0546_cottonee.json | 32 ++ .../spawn_pool_world/0547_whimsicott.json | 32 ++ .../spawn_pool_world/0562_yamask.json | 49 ++ .../spawn_pool_world/0563_cofagrigus.json | 49 ++ .../spawn_pool_world/0626_bouffalant.json | 31 ++ .../spawn_pool_world/0659_bunnelby.json | 25 + .../spawn_pool_world/0660_diggersby.json | 25 + .../spawn_pool_world/0661_fletchling.json | 45 ++ .../spawn_pool_world/0662_fletchinder.json | 45 ++ .../spawn_pool_world/0663_talonflame.json | 45 ++ .../spawn_pool_world/0664_scatterbug.json | 408 ++++++++++++++++ .../spawn_pool_world/0665_spewpa.json | 410 ++++++++++++++++ .../spawn_pool_world/0666_vivillon.json | 450 ++++++++++++++++++ .../spawn_pool_world/0690_skrelp.json | 25 + .../spawn_pool_world/0691_dragalge.json | 25 + .../spawn_pool_world/0708_phantump.json | 59 +++ .../spawn_pool_world/0709_trevenant.json | 59 +++ .../spawn_pool_world/0739_crabrawler.json | 25 + .../spawn_pool_world/0740_crabominable.json | 25 + .../spawn_pool_world/0742_cutiefly.json | 53 +++ .../spawn_pool_world/0743_ribombee.json | 53 +++ .../spawn_pool_world/0749_mudbray.json | 32 ++ .../spawn_pool_world/0750_mudsdale.json | 32 ++ .../spawn_pool_world/0764_comfey.json | 44 ++ .../spawn_pool_world/0767_wimpod.json | 71 +++ .../spawn_pool_world/0768_golisopod.json | 71 +++ .../spawn_pool_world/0775_komala.json | 26 + .../spawn_pool_world/0821_rookidee.json | 35 ++ .../spawn_pool_world/0822_corvisquire.json | 35 ++ .../spawn_pool_world/0823_corviknight.json | 35 ++ .../spawn_pool_world/0827_nickit.json | 46 ++ .../spawn_pool_world/0828_thievul.json | 46 ++ .../spawn_pool_world/0835_yamper.json | 37 ++ .../spawn_pool_world/0836_boltund.json | 37 ++ .../spawn_pool_world/0846_arrokuda.json | 31 ++ .../spawn_pool_world/0847_barraskewda.json | 31 ++ .../spawn_pool_world/0862_obstagoon.json | 31 ++ .../spawn_pool_world/0863_perrserker.json | 33 ++ .../spawn_pool_world/0865_sirfetchd.json | 31 ++ .../spawn_pool_world/0870_falinks.json | 49 ++ .../spawn_pool_world/0901_ursaluna.json | 26 + .../spawn_pool_world/0906_sprigatito.json | 39 ++ .../spawn_pool_world/0907_floragato.json | 39 ++ .../spawn_pool_world/0908_meowscarada.json | 39 ++ .../spawn_pool_world/0909_fuecoco.json | 38 ++ .../spawn_pool_world/0910_crocalor.json | 38 ++ .../spawn_pool_world/0911_skeledirge.json | 38 ++ .../spawn_pool_world/0912_quaxly.json | 22 + .../spawn_pool_world/0913_quaxwell.json | 22 + .../spawn_pool_world/0914_quaquavel.json | 22 + .../spawn_pool_world/0915_lechonk.json | 69 +++ .../spawn_pool_world/0916_oinkolonge.json | 63 +++ .../spawn_pool_world/0924_tandemaus.json | 25 + .../spawn_pool_world/0925_maushold.json | 25 + .../spawn_pool_world/0926_fidough.json | 26 + .../spawn_pool_world/0927_dachsbun.json | 26 + .../spawn_pool_world/0931_squawkabilly.json | 68 +++ .../spawn_pool_world/0932_nacli.json | 25 + .../spawn_pool_world/0933_naclstack.json | 25 + .../spawn_pool_world/0934_garganacl.json | 25 + .../spawn_pool_world/0935_charcadet.json | 42 ++ .../spawn_pool_world/0936_armarouge.json | 42 ++ .../spawn_pool_world/0937_ceruledge.json | 42 ++ .../spawn_pool_world/0942_maschiff.json | 64 +++ .../spawn_pool_world/0943_mabosstiff.json | 64 +++ .../spawn_pool_world/0944_shroodle.json | 26 + .../spawn_pool_world/0945_grafaifai.json | 27 ++ .../spawn_pool_world/0955_flittle.json | 31 ++ .../spawn_pool_world/0956_espathra.json | 31 ++ .../spawn_pool_world/0957_tinkatink.json | 25 + .../spawn_pool_world/0958_tinkatuff.json | 25 + .../spawn_pool_world/0959_tinkaton.json | 25 + .../spawn_pool_world/0965_varoom.json | 40 ++ .../spawn_pool_world/0966_revavroom.json | 40 ++ .../spawn_pool_world/0969_glimmet.json | 39 ++ .../spawn_pool_world/0970_glimmora.json | 39 ++ .../spawn_pool_world/0974_cetottle.json | 44 ++ .../spawn_pool_world/0975_cetitan.json | 44 ++ .../spawn_pool_world/0979_annihilape.json | 27 ++ .../spawn_pool_world/0980_clodsire.json | 45 ++ .../cobblemon/species/generation6/spewpa.json | 60 ++- .../tags/worldgen/biome/is_ocean.json | 3 +- 179 files changed, 8302 insertions(+), 17 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0179_mareep.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0180_flaaffy.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0181_ampharos.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0740_crabominable.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0827_nickit.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0828_thievul.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0870_falinks.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkolonge.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json index cf87cbc85c..05b9359f69 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json @@ -130,5 +130,6 @@ "anticondition": { "neededBaseBlocks": [ "minecraft:farmland" + ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json index 24e44b5a44..208d92b377 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json @@ -27,6 +27,7 @@ "water_surface" ], "type": "pokemon", + "context": "surface", "bucket": "common", "level": "1-20", "weight": 1.98, @@ -35,7 +36,7 @@ } }, { - "id": "magikarp-2", + "id": "magikarp-3", "pokemon": "magikarp", "presets": [ "underwater" @@ -59,6 +60,7 @@ "water_surface" ], "type": "pokemon", + "context": "surface", "bucket": "common", "level": "1-20", "weight": 1.98, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json new file mode 100644 index 0000000000..c46c8622ab --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "chikorita", + "pokemon": "chikorita", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-32", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json new file mode 100644 index 0000000000..cfcaa8df44 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "bayleef", + "pokemon": "bayleef", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "16-41", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json new file mode 100644 index 0000000000..5939a7e8b0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "meganium", + "pokemon": "meganium", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "32-53", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json new file mode 100644 index 0000000000..b66ed225b0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json @@ -0,0 +1,30 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cyndaquil", + "pokemon": "cyndaquil", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json new file mode 100644 index 0000000000..9f369a09d6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json @@ -0,0 +1,30 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quilava", + "pokemon": "quilava", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "17-41", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json new file mode 100644 index 0000000000..086434ce0c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json @@ -0,0 +1,30 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "typlosion", + "pokemon": "typlosion", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "36-53", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json new file mode 100644 index 0000000000..5e2dabb108 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json @@ -0,0 +1,43 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "totodile", + "pokemon": "totodile", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + }, + { + "id": "totodile", + "pokemon": "totodile", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "ultra-rare", + "level": "5-31", + "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/0159_croconaw.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json new file mode 100644 index 0000000000..1cdbce16f6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json @@ -0,0 +1,43 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "croconaw", + "pokemon": "croconaw", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "18-41", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + }, + { + "id": "croconaw", + "pokemon": "croconaw", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "ultra-rare", + "level": "18-41", + "weight": 0.9, + "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/0160_feraligatr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json new file mode 100644 index 0000000000..ccbed983c5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json @@ -0,0 +1,43 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "feraligatr", + "pokemon": "feraligatr", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "30-53", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + }, + { + "id": "feraligatr", + "pokemon": "feraligatr", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "ultra-rare", + "level": "30-53", + "weight": 0.1, + "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/0163_hoothoot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json new file mode 100644 index 0000000000..ec9c4cc66a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json @@ -0,0 +1,30 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "hoothoot", + "pokemon": "hoothoot", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_forest", + "#cobblemon:is_sky", + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json new file mode 100644 index 0000000000..be5cde412a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json @@ -0,0 +1,30 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "noctowl", + "pokemon": "noctowl", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-45", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_forest", + "#cobblemon:is_sky", + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json new file mode 100644 index 0000000000..9bab79ff84 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json @@ -0,0 +1,100 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "spinarak", + "pokemon": "spinarak", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle", + "#cobblemon:is_spooky" + ], + "timeRange": "night", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "spinarak", + "pokemon": "spinarak", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "terralith:cave/infested_caves", + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "spinarak", + "pokemon": "spinarak", + "presets": [ + "derelict" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "spinarak", + "pokemon": "spinarak", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 1.8, + "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/0168_ariados.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json new file mode 100644 index 0000000000..211dc7490e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json @@ -0,0 +1,100 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ariados", + "pokemon": "ariados", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle", + "#cobblemon:is_spooky" + ], + "timeRange": "night", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "ariados", + "pokemon": "ariados", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "terralith:cave/infested_caves", + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "ariados", + "pokemon": "ariados", + "presets": [ + "derelict" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 0.6, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "ariados", + "pokemon": "ariados", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 0.2, + "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/0170_chinchou.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json new file mode 100644 index 0000000000..04d5a999d5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "chinchou", + "pokemon": "chinchou", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "8-33", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_deep" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json new file mode 100644 index 0000000000..427ce666c9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "lanturn", + "pokemon": "lanturn", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "27-46", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_deep" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0179_mareep.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0179_mareep.json new file mode 100644 index 0000000000..3b3c8edbf8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0179_mareep.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "mareep-1", + "pokemon": "mareep", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 9.0, + "weightMultipliers": [ + { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_highlands", + "#cobblemon:is_plains" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0180_flaaffy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0180_flaaffy.json new file mode 100644 index 0000000000..b7076d54c8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0180_flaaffy.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "flaaffy-1", + "pokemon": "flaaffy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "15-37", + "weight": 0.9, + "weightMultipliers": [ + { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_highlands", + "#cobblemon:is_plains" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0181_ampharos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0181_ampharos.json new file mode 100644 index 0000000000..0280452628 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0181_ampharos.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ampharos-1", + "pokemon": "ampharos", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "weight": 0.1, + "weightMultipliers": [ + { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_highlands", + "#cobblemon:is_plains" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json new file mode 100644 index 0000000000..909919a30f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "aipom", + "pokemon": "aipom", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "11-36", + "weight": 5.4, + "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/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json new file mode 100644 index 0000000000..407c518d7a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -0,0 +1,140 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "wooper", + "pokemon": "wooper", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper", + "pokemon": "wooper", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper", + "pokemon": "wooper", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper", + "pokemon": "wooper", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper", + "pokemon": "wooper", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-21", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp", + "minecraft:mangrove_swamp", + "#cobblemon:is_savanna" + ], + "isRaining": true + }, + "anticondition": { + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + }, + { + "id": "wooper", + "pokemon": "wooper", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "1-21", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp", + "minecraft:mangrove_swamp", + "#cobblemon:is_savanna" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json new file mode 100644 index 0000000000..4ccca3251d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json @@ -0,0 +1,136 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quagsire", + "pokemon": "quagsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire", + "pokemon": "quagsire", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire", + "pokemon": "quagsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire", + "pokemon": "quagsire", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire", + "pokemon": "quagsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-43", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp" + ], + "isRaining": true + }, + "anticondition": { + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + }, + { + "id": "quagsire", + "pokemon": "quagsire", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "20-43", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json new file mode 100644 index 0000000000..3aae19661c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gligar", + "pokemon": "gligar", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "18-43", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ], + "timeRange": "night" + } + }, + { + "id": "gligar", + "pokemon": "gligar", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-43", + "weight": 1.8, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json new file mode 100644 index 0000000000..f6d060dd65 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json @@ -0,0 +1,49 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "snubbull", + "pokemon": "snubbull", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "snubbull", + "pokemon": "snubbull", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json new file mode 100644 index 0000000000..3c01c81b4d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json @@ -0,0 +1,49 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "granbull", + "pokemon": "granbull", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-45", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "granbull", + "pokemon": "granbull", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-45", + "weight": 0.6, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json new file mode 100644 index 0000000000..fc1fb3437d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shuckle", + "pokemon": "shuckle", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-51", + "weight": 6.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json new file mode 100644 index 0000000000..5e8e01a942 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "teddiursa", + "pokemon": "teddiursa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_taiga" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json new file mode 100644 index 0000000000..8acf54f06d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ursaring", + "pokemon": "ursaring", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-50", + "weight": 0.18, + "condition": { + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_taiga" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json new file mode 100644 index 0000000000..db9a9178fd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json @@ -0,0 +1,55 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "phanpy", + "pokemon": "phanpy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "phanpy", + "pokemon": "phanpy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "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/0232_donphan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json new file mode 100644 index 0000000000..35331e0907 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json @@ -0,0 +1,55 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "donphan", + "pokemon": "donphan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-50", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "donphan", + "pokemon": "donphan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-50", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "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/0261_poochyena.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json new file mode 100644 index 0000000000..9de650adac --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json @@ -0,0 +1,46 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "poochyena", + "pokemon": "poochyena", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-22", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_savanna" + ], + "timeRange": "night" + } + }, + { + "id": "poochyena", + "pokemon": "poochyena", + "presets": [ + "natural", + "pillager_outpost" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-22", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json new file mode 100644 index 0000000000..a6c95a7be8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json @@ -0,0 +1,46 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "mightyena", + "pokemon": "mightyena", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-42", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_savanna" + ], + "timeRange": "night" + } + }, + { + "id": "mightyena", + "pokemon": "mightyena", + "presets": [ + "natural", + "pillager_outpost" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-42", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json new file mode 100644 index 0000000000..810afcbdc9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "zigzagoon", + "pokemon": "zigzagoon", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate", + "#cobblemon:is_taiga" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json new file mode 100644 index 0000000000..b34d85ccf9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "linoone", + "pokemon": "linoone", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-42", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate", + "#cobblemon:is_taiga" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json new file mode 100644 index 0000000000..10b93a18c2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json @@ -0,0 +1,33 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tailow", + "pokemon": "tailow", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky", + "#cobblemon:is_temperate" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json new file mode 100644 index 0000000000..f062fa3610 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json @@ -0,0 +1,33 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "swellow", + "pokemon": "swellow", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-46", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky", + "#cobblemon:is_temperate" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json new file mode 100644 index 0000000000..56dac0ee39 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json @@ -0,0 +1,29 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "wingull", + "pokemon": "wingull", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast", + "#minecraft:is_ocean", + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json new file mode 100644 index 0000000000..017d2826e8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json @@ -0,0 +1,29 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "pelipper", + "pokemon": "pelipper", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-44", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast", + "#minecraft:is_ocean", + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json new file mode 100644 index 0000000000..9fd5b28043 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ralts", + "pokemon": "ralts", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-20", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical", + "#cobblemon:is_snowy" + ] + } + }, + { + "id": "ralts", + "pokemon": "ralts", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-20", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "ralts", + "pokemon": "ralts", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json new file mode 100644 index 0000000000..785ea419db --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "kirlia", + "pokemon": "kirlia", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-29", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical", + "#cobblemon:is_snowy" + ] + } + }, + { + "id": "kirlia", + "pokemon": "kirlia", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-29", + "weight": 0.18, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "kirlia", + "pokemon": "kirlia", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-29", + "weight": 0.18, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json new file mode 100644 index 0000000000..85bd997cf8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gardevoir", + "pokemon": "gardevoir", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.05, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical", + "#cobblemon:is_snowy" + ] + } + }, + { + "id": "gardevoir", + "pokemon": "gardevoir", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "gardevoir", + "pokemon": "gardevoir", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json new file mode 100644 index 0000000000..be8a8196b6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "surskit", + "pokemon": "surskit", + "presets": [ + "water_surface", + "freshwater" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "2-27", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "timeRange": "night", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json new file mode 100644 index 0000000000..f97d30c1ef --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "masquerain", + "pokemon": "masquerain", + "presets": [ + "water_surface", + "freshwater" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "22-45", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "timeRange": "night", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json new file mode 100644 index 0000000000..41158468f5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "nincada", + "pokemon": "nincada", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss", + "#cobblemon:is_abyss" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json new file mode 100644 index 0000000000..94cde7025b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json @@ -0,0 +1,34 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ninjask", + "pokemon": "ninjask", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-46", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json new file mode 100644 index 0000000000..b0e245dc73 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json @@ -0,0 +1,34 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shedinja", + "pokemon": "shedinja", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-24", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle" + ], + "timeRange": "night", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json new file mode 100644 index 0000000000..ee5061f5e3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "volbeat", + "pokemon": "volbeat", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-43", + "weight": 5.0, + "condition": { + "canSeeSky": true, + "timeRange": "night", + "isRaining": false + } + }, + { + "id": "volbeat", + "pokemon": "volbeat", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "18-43", + "weight": 5.0, + "condition": { + "canSeeSky": true, + "timeRange": "night", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json new file mode 100644 index 0000000000..5099eabde4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "illumise", + "pokemon": "illumise", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-43", + "weight": 5.0, + "condition": { + "canSeeSky": true, + "timeRange": "night", + "isRaining": false + } + }, + { + "id": "illumise", + "pokemon": "illumise", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "18-43", + "weight": 5.0, + "condition": { + "canSeeSky": true, + "timeRange": "night", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json new file mode 100644 index 0000000000..57e0fe9916 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json @@ -0,0 +1,68 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "numel", + "pokemon": "numel", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "numel", + "pokemon": "numel", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "condition": {} + }, + { + "id": "numel", + "pokemon": "numel", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_volcanic" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json new file mode 100644 index 0000000000..578a430412 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json @@ -0,0 +1,68 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "camerupt", + "pokemon": "camerupt", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "33-46", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "camerupt", + "pokemon": "camerupt", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "33-46", + "weight": 0.6, + "condition": {} + }, + { + "id": "camerupt", + "pokemon": "camerupt", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "33-46", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_volcanic" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json new file mode 100644 index 0000000000..6a8ca5f21b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cacnea", + "pokemon": "cacnea", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sandy" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json new file mode 100644 index 0000000000..00dd70aedf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cacturne", + "pokemon": "cacturne", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-48", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sandy" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json new file mode 100644 index 0000000000..1694ba8dc4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "barboach", + "pokemon": "barboach", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "4-29", + "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/0340_whiscash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json new file mode 100644 index 0000000000..8a77994f3b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "whiscash", + "pokemon": "whiscash", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "30-47", + "weight": 1.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/0355_duskull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json new file mode 100644 index 0000000000..2146b9e019 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json @@ -0,0 +1,57 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "duskull", + "pokemon": "duskull", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "duskull", + "pokemon": "duskull", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": {} + }, + { + "id": "duskull", + "pokemon": "duskull", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json new file mode 100644 index 0000000000..bd8a5b788d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json @@ -0,0 +1,57 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dusclops", + "pokemon": "dusclops", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "37-46", + "weight": 0.54, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "dusclops", + "pokemon": "dusclops", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "37-46", + "weight": 0.9, + "condition": {} + }, + { + "id": "dusclops", + "pokemon": "dusclops", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "37-46", + "weight": 0.54, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json new file mode 100644 index 0000000000..a5d1c6e5f5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "chimecho", + "pokemon": "chimecho", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-46", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_spooky", + "#cobblemon:is_taiga" + ], + "timeRange": "night" + } + }, + { + "id": "chimecho", + "pokemon": "chimecho", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-46", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_magical" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json new file mode 100644 index 0000000000..4867b22584 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json @@ -0,0 +1,43 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "clamperl", + "pokemon": "clamperl", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "10-35", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_deep" + ] + } + }, + { + "id": "clamperl", + "pokemon": "clamperl", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "rare", + "level": "10-35", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_reef" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json new file mode 100644 index 0000000000..3ce8a65a25 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json @@ -0,0 +1,43 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "huntail", + "pokemon": "huntail", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_deep" + ] + } + }, + { + "id": "huntail", + "pokemon": "huntail", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "rare", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_reef" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json new file mode 100644 index 0000000000..f81731ad6c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json @@ -0,0 +1,43 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gorebyss", + "pokemon": "gorebyss", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_deep" + ] + } + }, + { + "id": "gorebyss", + "pokemon": "gorebyss", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "rare", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_reef" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json new file mode 100644 index 0000000000..7fd2359b1f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json @@ -0,0 +1,66 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "relicanth-1", + "pokemon": "relicanth", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "24-49", + "weight": 2.0, + "condition": { + "biomes": [ + "#cobblemon:is_deep" + ] + } + }, + { + "id": "relicanth-2", + "pokemon": "relicanth", + "presets": [ + "underwater", + "ocean_ruins" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "24-49", + "weight": 2.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#minecraft:is_ocean" + ] + } + }, + { + "id": "relicanth-3", + "pokemon": "relicanth", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "rare", + "level": "24-49", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#minecraft:is_ocean" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json new file mode 100644 index 0000000000..b20ea6c740 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "beldum-1", + "pokemon": "beldum", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_dripstone", + "#cobblemon:is_peak" + ] + } + }, + { + "id": "beldum-2", + "pokemon": "beldum", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 9.0, + "condition": { + "biomes": [ + "#minecraft:is_end" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json new file mode 100644 index 0000000000..2b5f02b883 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "metang-1", + "pokemon": "metang", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-44", + "weight": 0.9, + "condition": { + "biomes": [ + "#cobblemon:is_dripstone", + "#cobblemon:is_peak" + ] + } + }, + { + "id": "metang-2", + "pokemon": "metang", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-44", + "weight": 0.9, + "condition": { + "biomes": [ + "#minecraft:is_end" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json new file mode 100644 index 0000000000..d238c88e14 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "metagross-1", + "pokemon": "metagross", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "45-60", + "weight": 0.1, + "condition": { + "biomes": [ + "#cobblemon:is_dripstone", + "#cobblemon:is_peak" + ] + } + }, + { + "id": "metagross-2", + "pokemon": "metagross", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "45-60", + "weight": 0.1, + "condition": { + "biomes": [ + "#minecraft:is_end" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json new file mode 100644 index 0000000000..8ddbd96327 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "starly", + "pokemon": "starly", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_sky", + "#cobblemon:is_snowy", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json new file mode 100644 index 0000000000..f257b75583 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "staravia", + "pokemon": "staravia", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "14-34", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_sky", + "#cobblemon:is_snowy", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json new file mode 100644 index 0000000000..8f485dce9b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "staraptor", + "pokemon": "staraptor", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-49", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_sky", + "#cobblemon:is_snowy", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json new file mode 100644 index 0000000000..97dfbd65c3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shinx", + "pokemon": "shinx", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-26", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert", + "#cobblemon:is_savanna" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json new file mode 100644 index 0000000000..f18dc2d072 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "luxio", + "pokemon": "luxio", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "15-36", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert", + "#cobblemon:is_savanna" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json new file mode 100644 index 0000000000..eaee9c0738 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "luxray", + "pokemon": "luxray", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-52", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert", + "#cobblemon:is_savanna" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json new file mode 100644 index 0000000000..e45225569d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "combee", + "pokemon": "combee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 1.98, + "weightMultiplier": { + "multiplier": 25.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:bee_nest" + ] + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ], + "timeRange": "day", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json new file mode 100644 index 0000000000..012bed3883 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "vespiquen", + "pokemon": "vespiquen", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-47", + "weight": 0.02, + "weightMultiplier": { + "multiplier": 25.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:bee_nest" + ] + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ], + "timeRange": "day", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json new file mode 100644 index 0000000000..782dcaf1c3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json @@ -0,0 +1,55 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "buizel-1", + "pokemon": "buizel", + "presets": [ + "natural", + "freshwater" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "condition": { + "canSeeSky": true + } + }, + { + "id": "buizel-2", + "pokemon": "buizel", + "presets": [ + "underwater", + "freshwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "condition": { + "canSeeSky": true + } + }, + { + "id": "buizel-3", + "pokemon": "buizel", + "presets": [ + "water_surface", + "freshwater" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json new file mode 100644 index 0000000000..dc57dcc4b5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json @@ -0,0 +1,55 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "floatzel-1", + "pokemon": "floatzel", + "presets": [ + "natural", + "freshwater" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-50", + "weight": 0.2, + "condition": { + "canSeeSky": true + } + }, + { + "id": "floatzel-2", + "pokemon": "floatzel", + "presets": [ + "underwater", + "freshwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "26-50", + "weight": 0.2, + "condition": { + "canSeeSky": true + } + }, + { + "id": "floatzel-3", + "pokemon": "floatzel", + "presets": [ + "water_surface", + "freshwater" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "26-50", + "weight": 0.2, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json new file mode 100644 index 0000000000..f9bab26498 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ambipom", + "pokemon": "ambipom", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-48", + "weight": 0.6, + "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/0433_chingling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json new file mode 100644 index 0000000000..c2eeeb8233 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json @@ -0,0 +1,48 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "chingling-1", + "pokemon": "chingling", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "4-29", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_spooky", + "#cobblemon:is_taiga" + ], + "timeRange": "night" + } + }, + { + "id": "chingling-2", + "pokemon": "chingling", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "4-29", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_magical" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json new file mode 100644 index 0000000000..40a95374e5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gliscor-1", + "pokemon": "gliscor", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "38-51", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ], + "timeRange": "night" + } + }, + { + "id": "gliscor-2", + "pokemon": "gliscor", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-51", + "weight": 0.2, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json new file mode 100644 index 0000000000..5790ffb4cb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gallade-1", + "pokemon": "gallade", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.05, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical", + "#cobblemon:is_snowy" + ] + } + }, + { + "id": "gallade-2", + "pokemon": "gallade", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "gallade-3", + "pokemon": "gallade", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json new file mode 100644 index 0000000000..e07160ab36 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json @@ -0,0 +1,57 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dusknoir-1", + "pokemon": "dusknoir", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "41-53", + "weight": 0.06, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "dusknoir-2", + "pokemon": "dusknoir", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "41-53", + "weight": 0.1, + "condition": {} + }, + { + "id": "dusknoir-3", + "pokemon": "dusknoir", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "41-53", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json new file mode 100644 index 0000000000..102a8fd12d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "patrat", + "pokemon": "patrat", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_grassland" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json new file mode 100644 index 0000000000..2789f90533 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "watchog", + "pokemon": "watchog", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-42", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_grassland" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json new file mode 100644 index 0000000000..7e2666995d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "lillipup", + "pokemon": "lillipup", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_desert" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json new file mode 100644 index 0000000000..be1f526d92 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "herdier", + "pokemon": "herdier", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-37", + "weight": 0.54, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_desert" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json new file mode 100644 index 0000000000..f3b5885385 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "stoutland", + "pokemon": "stoutland", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-50", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_desert" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json new file mode 100644 index 0000000000..5a4bf1df45 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json @@ -0,0 +1,47 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "pidove-1", + "pokemon": "pidove", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain", + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + }, + { + "id": "pidove-2", + "pokemon": "pidove", + "presets": [ + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json new file mode 100644 index 0000000000..e5ed1be75a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json @@ -0,0 +1,47 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tranquill-1", + "pokemon": "tranquill", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-36", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain", + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + }, + { + "id": "tranquill-2", + "pokemon": "tranquill", + "presets": [ + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-36", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json new file mode 100644 index 0000000000..49a5b94a86 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json @@ -0,0 +1,47 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "unfezant-1", + "pokemon": "unfezant", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-49", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain", + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + }, + { + "id": "unfezant-2", + "pokemon": "unfezant", + "presets": [ + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-49", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json new file mode 100644 index 0000000000..7500d2f111 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "roggenrola", + "pokemon": "roggenrola", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json new file mode 100644 index 0000000000..41978a9099 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "boldore", + "pokemon": "boldore", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-39", + "weight": 0.9, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json new file mode 100644 index 0000000000..7013b1a8aa --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gigalith", + "pokemon": "gigalith", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-52", + "weight": 0.1, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json new file mode 100644 index 0000000000..450a7aa014 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "timburr", + "pokemon": "timburr", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json new file mode 100644 index 0000000000..a22bd1a2f9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gurdurr", + "pokemon": "gurdurr", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-41", + "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json new file mode 100644 index 0000000000..5eb14f9865 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "conkeldurr", + "pokemon": "conkeldurr", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "36-51", + "weight": 0.02, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json new file mode 100644 index 0000000000..bb028426e4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json @@ -0,0 +1,76 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "venipede-1", + "pokemon": "venipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-26", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ], + "timeRange": "night" + } + }, + { + "id": "venipede-2", + "pokemon": "venipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "night" + } + }, + { + "id": "venipede-3", + "pokemon": "venipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "venipede-4", + "pokemon": "venipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 5.4, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json new file mode 100644 index 0000000000..76d08f8cdf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json @@ -0,0 +1,76 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "whirlipede-1", + "pokemon": "whirlipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "22-36", + "weight": 0.54, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ], + "timeRange": "night" + } + }, + { + "id": "whirlipede-2", + "pokemon": "whirlipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-36", + "weight": 0.54, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "night" + } + }, + { + "id": "whirlipede-3", + "pokemon": "whirlipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-36", + "weight": 0.18, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "whirlipede-4", + "pokemon": "whirlipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-36", + "weight": 0.54, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json new file mode 100644 index 0000000000..de65d82b8e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json @@ -0,0 +1,76 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "scolipede-1", + "pokemon": "scolipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-49", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ], + "timeRange": "night" + } + }, + { + "id": "scolipede-2", + "pokemon": "scolipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-49", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "night" + } + }, + { + "id": "scolipede-3", + "pokemon": "scolipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-49", + "weight": 0.02, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "scolipede-4", + "pokemon": "scolipede", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-49", + "weight": 0.06, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json new file mode 100644 index 0000000000..d85bfe55c3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cottonee", + "pokemon": "cottonee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json new file mode 100644 index 0000000000..168272ea77 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "whimsicott", + "pokemon": "whimsicott", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-48", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json new file mode 100644 index 0000000000..c5c9e4dba7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json @@ -0,0 +1,49 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "yamask-1", + "pokemon": "yamask", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 1.8, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_desert" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "yamask-2", + "pokemon": "yamask", + "presets": [ + "natural", + "desert_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json new file mode 100644 index 0000000000..1b88da0c46 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json @@ -0,0 +1,49 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cofagrigus-1", + "pokemon": "cofagrigus", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "34-48", + "weight": 0.2, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_desert" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "cofagrigus-2", + "pokemon": "cofagrigus", + "presets": [ + "natural", + "desert_pyramid" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-48", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json new file mode 100644 index 0000000000..12eb05f823 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "bouffalant", + "pokemon": "bouffalant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 10.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "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/0659_bunnelby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json new file mode 100644 index 0000000000..05acfe84ca --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "bunnelby", + "pokemon": "bunnelby", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_temperate" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json new file mode 100644 index 0000000000..fe1bac0cc3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "diggersby", + "pokemon": "diggersby", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-42", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_temperate" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json new file mode 100644 index 0000000000..447cfdc38f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json @@ -0,0 +1,45 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "fletchling-1", + "pokemon": "fletchling", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_sky", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + } + }, + { + "id": "fletchling-2", + "pokemon": "fletchling", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json new file mode 100644 index 0000000000..4c2be78a70 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json @@ -0,0 +1,45 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "fletchinder-1", + "pokemon": "fletchinder", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-38", + "weight": 0.54, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_sky", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + } + }, + { + "id": "fletchinder-2", + "pokemon": "fletchinder", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-38", + "weight": 0.54, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json new file mode 100644 index 0000000000..c0b21f2378 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json @@ -0,0 +1,45 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "talonflame-1", + "pokemon": "talonflame", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-50", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_sky", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + } + }, + { + "id": "talonflame-2", + "pokemon": "talonflame", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-50", + "weight": 0.06, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json new file mode 100644 index 0000000000..697c87b798 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json @@ -0,0 +1,408 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "scatterbug-1", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "scatterbug-2", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:cherry_grove", + "#cobblemon:is_magical" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + }, + { + "id": "scatterbug-3", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_reef" + ] + } + }, + { + "id": "scatterbug-4", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert" + ] + } + }, + { + "id": "scatterbug-5", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "biomes": [ + "minecraft:end_highlands" + ] + } + }, + { + "id": "scatterbug-6", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "scatterbug-7", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ] + } + }, + { + "id": "scatterbug-8", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true + } + }, + { + "id": "scatterbug-9", + "pokemon": "scatterbug", + "presets": [ + "natural", + "freshwater" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen" + ] + } + }, + { + "id": "scatterbug-10", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_glacial", + "#cobblemon:is_snowy", + "#cobblemon:is_tundra" + ] + } + }, + { + "id": "scatterbug-11", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ] + } + }, + { + "id": "scatterbug-12", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain" + ] + } + }, + { + "id": "scatterbug-13", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + }, + { + "id": "scatterbug-14", + "pokemon": "scatterbug", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": {} + }, + { + "id": "scatterbug-15", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ] + } + }, + { + "id": "scatterbug-16", + "pokemon": "scatterbug", + "presets": [ + "natural", + "urban", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "scatterbug-17", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ] + } + }, + { + "id": "scatterbug-18", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_savanna" + ] + } + }, + { + "id": "scatterbug-19", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky", + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "scatterbug-20", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ] + } + }, + { + "id": "scatterbug-21", + "pokemon": "scatterbug", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.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/0665_spewpa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json new file mode 100644 index 0000000000..a86962029e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json @@ -0,0 +1,410 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "spewpa-1", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "spewpa-2", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:cherry_grove", + "#cobblemon:is_magical" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + }, + { + "id": "spewpa-3", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_reef" + ] + } + }, + { + "id": "spewpa-4", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert" + ] + } + }, + { + "id": "spewpa-5", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "biomes": [ + "minecraft:end_highlands" + ] + } + }, + { + "id": "spewpa-6", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "spewpa-7", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ] + } + }, + { + "id": "spewpa-8", + "pokemon": "spewpa", + "presets": [ + "natural", + "freshwater" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true + } + }, + { + "id": "spewpa-9", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen" + ] + } + }, + { + "id": "spewpa-10", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_glacial", + "#cobblemon:is_snowy", + "#cobblemon:is_tundra" + ] + } + }, + { + "id": "spewpa-11", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ] + } + }, + { + "id": "spewpa-12", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain" + ] + } + }, + { + "id": "spewpa-13", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + }, + { + "id": "spewpa-14", + "pokemon": "spewpa", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": {} + }, + { + "id": "spewpa-15", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ] + } + }, + { + "id": "spewpa-16", + "pokemon": "spewpa", + "presets": [ + "natural", + "urban", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "spewpa-17", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ] + } + }, + { + "id": "spewpa-18", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_savanna" + ] + } + }, + { + "id": "spewpa-19", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky", + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "spewpa-20", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ] + } + }, + { + "id": "spewpa-21", + "pokemon": "spewpa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 2.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/0666_vivillon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json new file mode 100644 index 0000000000..caaa4d7a7a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json @@ -0,0 +1,450 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "vivillon[highplains]", + "pokemon": "vivillon vivillon_wings=high_plains", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[fancy]", + "pokemon": "vivillon vivillon_wings=fancy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:cherry_grove", + "#cobblemon:is_magical" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + }, + { + "id": "vivillon[ocean]", + "pokemon": "vivillon vivillon_wings=ocean", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_reef" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[sandstorm]", + "pokemon": "vivillon vivillon_wings=sandstorm", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[ender]", + "pokemon": "vivillon vivillon_wings=ender", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "biomes": [ + "minecraft:end_highlands" + ] + } + }, + { + "id": "vivillon[meadow]", + "pokemon": "vivillon vivillon_wings=meadow", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "vivillon[garden]", + "pokemon": "vivillon vivillon_wings=garden", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[river]", + "pokemon": "vivillon vivillon_wings=river", + "presets": [ + "natural", + "freshwater" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[polar]", + "pokemon": "vivillon vivillon_wings=polar", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[tundra]", + "pokemon": "vivillon vivillon_wings=tundra", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_glacial", + "#cobblemon:is_snowy", + "#cobblemon:is_tundra" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[jungle]", + "pokemon": "vivillon vivillon_wings=jungle", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[monsoon]", + "pokemon": "vivillon vivillon_wings=monsoon", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[archipelago]", + "pokemon": "vivillon vivillon_wings=archipelago", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[nether]", + "pokemon": "vivillon vivillon_wings=nether", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": {} + }, + { + "id": "vivillon[marine]", + "pokemon": "vivillon vivillon_wings=marine", + "presets": [ + "natural", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[modern]", + "pokemon": "vivillon vivillon_wings=modern", + "presets": [ + "natural", + "urban", + "foliage", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[continental]", + "pokemon": "vivillon vivillon_wings=continental", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[savanna]", + "pokemon": "vivillon vivillon_wings=savanna", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_savanna" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[sun]", + "pokemon": "vivillon vivillon_wings=sun", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky", + "minecraft:sunflower_plains" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[elegant]", + "pokemon": "vivillon vivillon_wings=elegant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon[icysnow]", + "pokemon": "vivillon vivillon_wings=icysnow", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_taiga" + ], + "timeRange": "day", + "isRaining": false + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json new file mode 100644 index 0000000000..3ba264333f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "skrelp", + "pokemon": "skrelp", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "7-32", + "weight": 9.0, + "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/0691_dragalge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json new file mode 100644 index 0000000000..1bc6698f35 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dragalge", + "pokemon": "dragalge", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "48-49", + "weight": 1.0, + "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/0708_phantump.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json new file mode 100644 index 0000000000..bb66afbc3b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json @@ -0,0 +1,59 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "phantump-1", + "pokemon": "phantump", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ], + "timeRange": "night" + } + }, + { + "id": "phantump-2", + "pokemon": "phantump", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "condition": {} + }, + { + "id": "phantump-3", + "pokemon": "phantump", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json new file mode 100644 index 0000000000..ca46ebeb21 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json @@ -0,0 +1,59 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "trevenant-1", + "pokemon": "trevenant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-47", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ], + "timeRange": "night" + } + }, + { + "id": "trevenant-2", + "pokemon": "trevenant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-47", + "weight": 0.6, + "condition": {} + }, + { + "id": "trevenant-3", + "pokemon": "trevenant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-47", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_spooky" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json new file mode 100644 index 0000000000..6956978ce6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "crabrawler", + "pokemon": "crabrawler", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 6.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/0740_crabominable.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0740_crabominable.json new file mode 100644 index 0000000000..756c638652 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0740_crabominable.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "crabominable", + "pokemon": "crabominable", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "29-48", + "weight": 6.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_peak" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json new file mode 100644 index 0000000000..2e33781ab4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json @@ -0,0 +1,53 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cutiefly-1", + "pokemon": "cutiefly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "cutiefly-2", + "pokemon": "cutiefly", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_floral" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json new file mode 100644 index 0000000000..2120d949e4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json @@ -0,0 +1,53 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ribombee-1", + "pokemon": "ribombee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-46", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "ribombee-2", + "pokemon": "ribombee", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-46", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_floral" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json new file mode 100644 index 0000000000..f62be4054d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "mudbray", + "pokemon": "mudbray", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "14-39", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_grassland" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json new file mode 100644 index 0000000000..70814e8140 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "mudsdale", + "pokemon": "mudsdale", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-50", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_grassland" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json new file mode 100644 index 0000000000..897cdda6e9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "comfey-1", + "pokemon": "comfey", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-49", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ] + } + }, + { + "id": "comfey-2", + "pokemon": "comfey", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "24-49", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json new file mode 100644 index 0000000000..8b8dd9fb5b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json @@ -0,0 +1,71 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "wimpod-1", + "pokemon": "wimpod", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-23", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast" + ] + } + }, + { + "id": "wimpod-2", + "pokemon": "wimpod", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-23", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "wimpod-3", + "pokemon": "wimpod", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "1-23", + "weight": 9.0, + "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/0768_golisopod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json new file mode 100644 index 0000000000..319b0f7151 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json @@ -0,0 +1,71 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "golisopod-1", + "pokemon": "golisopod", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-53", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast" + ] + } + }, + { + "id": "golisopod-2", + "pokemon": "golisopod", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-53", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] + } + }, + { + "id": "golisopod-3", + "pokemon": "golisopod", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "30-53", + "weight": 1.0, + "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/0775_komala.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json new file mode 100644 index 0000000000..ec7f8e2313 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "komala", + "pokemon": "komala", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-48", + "weight": 6.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/0821_rookidee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json new file mode 100644 index 0000000000..75594ac3ea --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "rookidee", + "pokemon": "rookidee", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_sky", + "#cobblemon:is_spooky", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json new file mode 100644 index 0000000000..827ade10e9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "corvisquire", + "pokemon": "corvisquire", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-37", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_sky", + "#cobblemon:is_spooky", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json new file mode 100644 index 0000000000..5fb50fb779 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "corviknight", + "pokemon": "corviknight", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-50", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_sky", + "#cobblemon:is_spooky", + "#cobblemon:is_taiga" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0827_nickit.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0827_nickit.json new file mode 100644 index 0000000000..00dd8368f1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0827_nickit.json @@ -0,0 +1,46 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "nickit-1", + "pokemon": "nickit", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ], + "timeRange": "night" + } + }, + { + "id": "nickit-2", + "pokemon": "nickit", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-25", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0828_thievul.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0828_thievul.json new file mode 100644 index 0000000000..10e35a51f8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0828_thievul.json @@ -0,0 +1,46 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "thievul-1", + "pokemon": "thievul", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-46", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ], + "timeRange": "night" + } + }, + { + "id": "thievul-2", + "pokemon": "thievul", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "18-46", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json new file mode 100644 index 0000000000..f0509e7d1c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json @@ -0,0 +1,37 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "yamper", + "pokemon": "yamper", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json new file mode 100644 index 0000000000..e191ba6854 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json @@ -0,0 +1,37 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "boltund", + "pokemon": "boltund", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-49", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json new file mode 100644 index 0000000000..dc3f1f95da --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "arrokuda", + "pokemon": "arrokuda", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "3-28", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mangrove_swamp", + "#minecraft:is_ocean" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json new file mode 100644 index 0000000000..dabe7ed6d2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "barraskewda", + "pokemon": "barraskewda", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "26-49", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mangrove_swamp", + "#minecraft:is_ocean" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json new file mode 100644 index 0000000000..7d04e4294b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "obstagoon", + "pokemon": "obstagoon", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-52", + "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "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/0863_perrserker.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json new file mode 100644 index 0000000000..ba2cb1ba4e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json @@ -0,0 +1,33 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "perrserker", + "pokemon": "perrserker", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-44", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_taiga" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json new file mode 100644 index 0000000000..5ed7e86452 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "sirfetchd", + "pokemon": "sirfetchd", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "33-51", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "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/0870_falinks.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0870_falinks.json new file mode 100644 index 0000000000..15f86ee320 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0870_falinks.json @@ -0,0 +1,49 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "falinks-1", + "pokemon": "falinks", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "22-47", + "weight": 2.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "falinks-2", + "pokemon": "falinks", + "presets": [ + "natural", + "nether_structures" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "22-47", + "weight": 10.0, + "condition": { + "biomes": [ + "#minecraft:is_nether" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json new file mode 100644 index 0000000000..69edfb5775 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ursaluna", + "pokemon": "ursaluna", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "45-55", + "weight": 0.02, + "condition": { + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_taiga" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json new file mode 100644 index 0000000000..4c81dd27be --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json @@ -0,0 +1,39 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "sprigatito-1", + "pokemon": "sprigatito", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical" + ] + } + }, + { + "id": "sprigatito-2", + "pokemon": "sprigatito", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json new file mode 100644 index 0000000000..73bcf3efdd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json @@ -0,0 +1,39 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "floragato-1", + "pokemon": "floragato", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "16-41", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical" + ] + } + }, + { + "id": "floragato-2", + "pokemon": "floragato", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "16-41", + "weight": 0.9, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json new file mode 100644 index 0000000000..f2fbf994b3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json @@ -0,0 +1,39 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "meowscarada-1", + "pokemon": "meowscarada", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "36-53", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical" + ] + } + }, + { + "id": "meowscarada-2", + "pokemon": "meowscarada", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "36-53", + "weight": 0.1, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json new file mode 100644 index 0000000000..5ceb162c1d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json @@ -0,0 +1,38 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "fuecoco-1", + "pokemon": "fuecoco", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "fuecoco-2", + "pokemon": "fuecoco", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json new file mode 100644 index 0000000000..1ee8596638 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json @@ -0,0 +1,38 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "crocalor-1", + "pokemon": "crocalor", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "16-41", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "crocalor-2", + "pokemon": "crocalor", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "16-41", + "weight": 0.9, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json new file mode 100644 index 0000000000..e9c97ccc30 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json @@ -0,0 +1,38 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "skeledirge-1", + "pokemon": "skeledirge", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "36-53", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "skeledirge-2", + "pokemon": "skeledirge", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "36-53", + "weight": 0.1, + "condition": {} + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json new file mode 100644 index 0000000000..10856e164b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json @@ -0,0 +1,22 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quaxly", + "pokemon": "quaxly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "5-31", + "weight": 9.0, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json new file mode 100644 index 0000000000..c66904513c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json @@ -0,0 +1,22 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quaxwell", + "pokemon": "quaxwell", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "16-41", + "weight": 0.9, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json new file mode 100644 index 0000000000..0a4dc12acf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json @@ -0,0 +1,22 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quaquavel", + "pokemon": "quaquavel", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "36-53", + "weight": 0.1, + "condition": { + "canSeeSky": true + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json new file mode 100644 index 0000000000..260668ca54 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json @@ -0,0 +1,69 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "lechonk-1", + "pokemon": "lechonk", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom", + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "lechonk-2", + "pokemon": "lechonk", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": {} + }, + { + "id": "lechonk-3", + "pokemon": "lechonk", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "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/0916_oinkolonge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkolonge.json new file mode 100644 index 0000000000..3c654f87f5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkolonge.json @@ -0,0 +1,63 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "oinkolonge-1", + "pokemon": "oinkolonge", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-49", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom", + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "oinkolonge-2", + "pokemon": "oinkolonge", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-49", + "weight": 1.0, + "condition": {} + }, + { + "id": "oinkolonge-3", + "pokemon": "oinkolonge", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-49", + "weight": 0.2, + "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/0924_tandemaus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json new file mode 100644 index 0000000000..2a6717790c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tandemaus", + "pokemon": "tandemaus", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json new file mode 100644 index 0000000000..893c1bc307 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "maushold", + "pokemon": "maushold", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-47", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json new file mode 100644 index 0000000000..049f143c81 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "fidough", + "pokemon": "fidough", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json new file mode 100644 index 0000000000..9922dcbc37 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dachsbun", + "pokemon": "dachsbun", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-48", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json new file mode 100644 index 0000000000..9ac1a522a1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json @@ -0,0 +1,68 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "squawkabilly-1", + "pokemon": "squawkabilly", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-42", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_savanna" + ], + "timeRange": "day" + } + }, + { + "id": "squawkabilly-2", + "pokemon": "squawkabilly", + "presets": [ + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-42", + "weight": 6.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "squawkabilly-3", + "pokemon": "squawkabilly", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-42", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json new file mode 100644 index 0000000000..f639757d24 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "nacli", + "pokemon": "nacli", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "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/0933_naclstack.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json new file mode 100644 index 0000000000..1b4bb9a0df --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "naclstack", + "pokemon": "naclstack", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-36", + "weight": 0.54, + "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/0934_garganacl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json new file mode 100644 index 0000000000..25d49f7783 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "garganacl", + "pokemon": "garganacl", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-50", + "weight": 0.06, + "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/0935_charcadet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json new file mode 100644 index 0000000000..0b4645d4e1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "charcadet-1", + "pokemon": "charcadet", + "presets": [ + "natural", + "nether_structures" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 9.0, + "condition": { + "biomes": [ + "#minecraft:is_nether" + ] + } + }, + { + "id": "charcadet-2", + "pokemon": "charcadet", + "presets": [ + "ruined_portal" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-26", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json new file mode 100644 index 0000000000..e84567bb10 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "armarouge-1", + "pokemon": "armarouge", + "presets": [ + "natural", + "nether_structures" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-53", + "weight": 0.5, + "condition": { + "biomes": [ + "#minecraft:is_nether" + ] + } + }, + { + "id": "armarouge-2", + "pokemon": "armarouge", + "presets": [ + "ruined_portal" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-53", + "weight": 0.1, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json new file mode 100644 index 0000000000..94c30cdee8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json @@ -0,0 +1,42 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ceruledge-1", + "pokemon": "ceruledge", + "presets": [ + "natural", + "nether_structures" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-53", + "weight": 0.5, + "condition": { + "biomes": [ + "#minecraft:is_nether" + ] + } + }, + { + "id": "ceruledge-2", + "pokemon": "ceruledge", + "presets": [ + "ruined_portal" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-53", + "weight": 0.1, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json new file mode 100644 index 0000000000..f151f9fde1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "maschiff-1", + "pokemon": "maschiff", + "presets": [ + "natural", + "pillager_outpost" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "maschiff-2", + "pokemon": "maschiff", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "maschiff-3", + "pokemon": "maschiff", + "presets": [ + "natural", + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json new file mode 100644 index 0000000000..77bde6a5e4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "mabosstiff-1", + "pokemon": "mabosstiff", + "presets": [ + "natural", + "pillager_outpost" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "mabosstiff-2", + "pokemon": "mabosstiff", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "mabosstiff-3", + "pokemon": "mabosstiff", + "presets": [ + "natural", + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json new file mode 100644 index 0000000000..23b9a1ec85 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shroodle", + "pokemon": "shroodle", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json new file mode 100644 index 0000000000..b0f42ea9b7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "grafaifai", + "pokemon": "grafaifai", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-49", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json new file mode 100644 index 0000000000..70573c2006 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "flittle", + "pokemon": "flittle", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-26", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json new file mode 100644 index 0000000000..ec672654e1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json @@ -0,0 +1,31 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "espathra", + "pokemon": "espathra", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "35-48", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_arid" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json new file mode 100644 index 0000000000..4032dcd4bc --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tinkatink", + "pokemon": "tinkatink", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json new file mode 100644 index 0000000000..1e28b06daf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tinkatuff", + "pokemon": "tinkatuff", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "24-38", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json new file mode 100644 index 0000000000..7493a97244 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json @@ -0,0 +1,25 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tinkaton", + "pokemon": "tinkaton", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "38-51", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json new file mode 100644 index 0000000000..d7671ad8bb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "varoom-1", + "pokemon": "varoom", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "varoom-2", + "pokemon": "varoom", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json new file mode 100644 index 0000000000..b3154276f3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "revavroom-1", + "pokemon": "revavroom", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "40-50", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ] + } + }, + { + "id": "revavroom-2", + "pokemon": "revavroom", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "40-50", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json new file mode 100644 index 0000000000..1ca407c6a0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json @@ -0,0 +1,39 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "glimmet-1", + "pokemon": "glimmet", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-35", + "weight": 1.8, + "condition": {} + }, + { + "id": "glimmet-2", + "pokemon": "glimmet", + "presets": [ + "natural", + "gemstones" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-35", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json new file mode 100644 index 0000000000..b014c5ab89 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json @@ -0,0 +1,39 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "glimmora-1", + "pokemon": "glimmora", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-53", + "weight": 0.2, + "condition": {} + }, + { + "id": "glimmora-2", + "pokemon": "glimmora", + "presets": [ + "natural", + "gemstones" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-53", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json new file mode 100644 index 0000000000..f082d50fcb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cetottle-1", + "pokemon": "cetottle", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen" + ] + } + }, + { + "id": "cetottle-2", + "pokemon": "cetottle", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_glacial", + "#cobblemon:is_tundra" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json new file mode 100644 index 0000000000..84a8450b9b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cetitan-1", + "pokemon": "cetitan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-52", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen" + ] + } + }, + { + "id": "cetitan-2", + "pokemon": "cetitan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-52", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_glacial", + "#cobblemon:is_tundra" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json new file mode 100644 index 0000000000..60b0173820 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "annihilape", + "pokemon": "annihilape", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-54", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_hills", + "#cobblemon:is_jungle" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json new file mode 100644 index 0000000000..fb20de4981 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json @@ -0,0 +1,45 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "clodsire-1", + "pokemon": "clodsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mangrove_swamp", + "#cobblemon:is_savanna" + ] + } + }, + { + "id": "clodsire-2", + "pokemon": "clodsire", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mangrove_swamp", + "#cobblemon:is_savanna" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json index 0f9438a4db..efce955a2e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json @@ -70,7 +70,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "#cobblemon:is_mushroom" } ] }, @@ -89,7 +89,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "#cobblemon:is_plains" } ] }, @@ -108,7 +108,11 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "#cobblemon:is_spooky" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_magical" } ] }, @@ -127,7 +131,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "minecraft:cherry_grove" } ] }, @@ -146,7 +150,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_floral" + "biomeCondition": "#cobblemon:is_forest" } ] }, @@ -165,7 +169,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "#cobblemon:is_badlands" } ] }, @@ -184,7 +188,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_snowy" + "biomeCondition": "#cobblemon:is_taiga" } ] }, @@ -222,7 +226,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_coast" + "biomeCondition": "#cobblemon:is_ocean" } ] }, @@ -241,7 +245,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_plains" + "biomeCondition": "#cobblemon:is_floral" } ] }, @@ -260,7 +264,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_plains" + "biomeCondition": "minecraft:is_void" } ] }, @@ -279,7 +283,11 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "#cobblemon:is_mountain" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_peak" } ] }, @@ -298,7 +306,11 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_deep" + "biomeCondition": "#cobblemon:is_coast" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_reef" } ] }, @@ -356,6 +368,10 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_river" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_swamp" } ] }, @@ -374,7 +390,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_sandy" + "biomeCondition": "#cobblemon:is_desert" } ] }, @@ -412,7 +428,15 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_void" + "biomeCondition": "#cobblemon:is_sky" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_volcano" + }, + { + "variant": "biome", + "biomeCondition": "minecraft:sunflower_plains" } ] }, @@ -432,6 +456,14 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_tundra" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_snowy" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_glacial" } ] }, diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json index 9645225bc4..688221e348 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "#minecraft:is_ocean", - "#cobblemon:is_coast", - } + "#cobblemon:is_coast" ] } \ No newline at end of file From 919dec68096aca4569e564c6e9829ab899ec5b5d Mon Sep 17 00:00:00 2001 From: tyzillion Date: Sun, 10 Sep 2023 19:02:20 -0400 Subject: [PATCH 04/40] Fixed json loading error. --- .../data/cobblemon/spawn_pool_world/0366_clamperl.json | 4 ++-- .../data/cobblemon/spawn_pool_world/0367_huntail.json | 4 ++-- .../data/cobblemon/spawn_pool_world/0368_gorebyss.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json index 4867b22584..619d40fc4b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "clamperl", + "id": "clamperl-1", "pokemon": "clamperl", "presets": [ "underwater" @@ -22,7 +22,7 @@ } }, { - "id": "clamperl", + "id": "clamperl-2", "pokemon": "clamperl", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json index 3ce8a65a25..7ae25bc566 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "huntail", + "id": "huntail-1", "pokemon": "huntail", "presets": [ "underwater" @@ -22,7 +22,7 @@ } }, { - "id": "huntail", + "id": "huntail-2", "pokemon": "huntail", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json index f81731ad6c..112f23c8ec 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "gorebyss", + "id": "gorebyss-1", "pokemon": "gorebyss", "presets": [ "underwater" @@ -22,7 +22,7 @@ } }, { - "id": "gorebyss", + "id": "gorebyss-2", "pokemon": "gorebyss", "presets": [ "underwater" From 79f7dd15199b516fa4732c35fb7b48b05be907cb Mon Sep 17 00:00:00 2001 From: tyzillion Date: Sun, 10 Sep 2023 19:35:50 -0400 Subject: [PATCH 05/40] Funny liscense moment. --- .../models/blockbench/pokemon/gen9/MeowscaradaModel.kt | 8 ++++---- .../client/pokemon/update/DmaxLevelUpdatePacket.kt | 8 ++++++++ .../client/pokemon/update/GmaxFactorUpdatePacket.kt | 8 ++++++++ .../client/pokemon/update/TeraTypeUpdatePacket.kt | 8 ++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt index 8f56148856..e3c2144016 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt @@ -85,8 +85,8 @@ class MeowscaradaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { ) ) } - override fun getFaintAnimation( - pokemonEntity: PokemonEntity, - state: PoseableEntityState - ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("meowscarada", "faint") else null +// override fun getFaintAnimation( +// pokemonEntity: PokemonEntity, +// state: PoseableEntityState +// ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("meowscarada", "faint") else null } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/DmaxLevelUpdatePacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/DmaxLevelUpdatePacket.kt index 2c7a3709ab..9b31c52068 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/DmaxLevelUpdatePacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/DmaxLevelUpdatePacket.kt @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + package com.cobblemon.mod.common.net.messages.client.pokemon.update import com.cobblemon.mod.common.net.IntSize diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/GmaxFactorUpdatePacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/GmaxFactorUpdatePacket.kt index 5d7134ade8..1a059897ee 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/GmaxFactorUpdatePacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/GmaxFactorUpdatePacket.kt @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + package com.cobblemon.mod.common.net.messages.client.pokemon.update import com.cobblemon.mod.common.pokemon.Pokemon diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/TeraTypeUpdatePacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/TeraTypeUpdatePacket.kt index 6bda09b817..3eb905bc54 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/TeraTypeUpdatePacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/TeraTypeUpdatePacket.kt @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + package com.cobblemon.mod.common.net.messages.client.pokemon.update import com.cobblemon.mod.common.api.types.ElementalType From 5eef45b49a22a6d5053b6ec597e2242a0c9ed08f Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Sun, 10 Sep 2023 21:21:03 -0400 Subject: [PATCH 06/40] Fixed structure names in presets and spawns. --- .../data/cobblemon/spawn_detail_presets/ancient_city.json | 2 +- .../data/cobblemon/spawn_detail_presets/desert_pyramid.json | 2 +- .../data/cobblemon/spawn_detail_presets/end_city.json | 2 +- .../cobblemon/spawn_detail_presets/illager_structures.json | 6 +++--- .../data/cobblemon/spawn_detail_presets/jungle_pyramid.json | 2 +- .../data/cobblemon/spawn_detail_presets/nether_fossil.json | 2 +- .../cobblemon/spawn_detail_presets/nether_structures.json | 4 ++-- .../data/cobblemon/spawn_detail_presets/ocean_monument.json | 2 +- .../data/cobblemon/spawn_detail_presets/ocean_ruins.json | 2 +- .../cobblemon/spawn_detail_presets/pillager_outpost.json | 2 +- .../data/cobblemon/spawn_detail_presets/ruined_portal.json | 2 +- .../data/cobblemon/spawn_detail_presets/shipwreck.json | 2 +- .../data/cobblemon/spawn_detail_presets/stronghold.json | 2 +- .../data/cobblemon/spawn_detail_presets/trail_ruins.json | 2 +- .../data/cobblemon/spawn_detail_presets/urban.json | 4 ++-- .../cobblemon/spawn_detail_presets/woodland_mansion.json | 2 +- .../data/cobblemon/spawn_pool_world/0561_sigilyph.json | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json index e2ea0c2abd..3d756a21aa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "ancient_city" + "minecraft:ancient_city" ], "maxY": 62, "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json index 3a701fd7a4..db660ae249 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "desert_pyramid" + "minecraft:desert_pyramid" ], "minY": 62, "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json index 88f99cab9b..ef5949b2ab 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "end_city" + "minecraft:end_city" ], "neededBaseBlocks": [ "minecraft:end_stone_bricks", diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json index 697ae4f43a..33e88ad04b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json @@ -1,9 +1,9 @@ { "condition": { "structures": [ - "pillager_outpost", - "swamp_hut", - "woodland_mansion" + "minecraft:pillager_outpost", + "minecraft:swamp_hut", + "minecraft:woodland_mansion" ], "minY": 62 } diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json index 8a50c7c656..b9e5fc583e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "jungle_pyramid" + "minecraft:jungle_pyramid" ], "minY": 62, "neededBaseBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json index 7811908b95..76157c7e0b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "nether_fossil" + "minecraft:nether_fossil" ], "neededNearbyBlocks": [ "minecraft:bone_block" diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json index 6b0481875e..b553ac655b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json @@ -1,8 +1,8 @@ { "condition": { "structures": [ - "bastion_remnant", - "fortress" + "minecraft:bastion_remnant", + "minecraft:fortress" ], "neededBaseBlocks": [ "minecraft:chiseled_polished_blackstone", diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json index dc98dbfded..db668d632a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "ocean_monument" + "minecraft:ocean_monument" ], "maxY": 62, "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json index 0fe60748f9..14131aeda9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "#ocean_ruin" + "#minecraft:ocean_ruin" ], "maxY": 62, "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json index 85f8072029..4cdc891909 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "pillager_outpost" + "minecraft:pillager_outpost" ], "minY": 62, "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json index f478904df5..0c25211a2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "#ruined_portal" + "#minecraft:ruined_portal" ], "neededNearbyBlocks": [ "minecraft:crying_obsidian", diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json index 50dbd043a3..142566cfed 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "#shipwreck" + "#minecraft:shipwreck" ], "maxY": 62, "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json index 7f3de5c4d1..3478220a9b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "stronghold" + "minecraft:stronghold" ], "maxY": 62, "neededBaseBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json index ec1e2bdbff..3bebe19751 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "trail_ruins" + "minecraft:trail_ruins" ], "minY": 32, "neededBaseBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json index d4fbde9807..699a0e8119 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "#village" + "#minecraft:village" ], "neededNearbyBlocks": [ "minecraft:white_concrete", @@ -24,7 +24,7 @@ }, "anticondition": { "structures": [ - "trail_ruins" + "minecraft:trail_ruins" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json index bc44d86859..5ffbdc9d1b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json @@ -1,7 +1,7 @@ { "condition": { "structures": [ - "woodland_mansion" + "minecraft:woodland_mansion" ], "minY": 62, "neededBaseBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json index a688fbc0fe..aacc9ba8db 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json @@ -22,7 +22,7 @@ "#cobblemon:is_overworld" ], "structures": [ - "desert_well" + "minecraft:desert_well" ] } }, From d74824172719ccaf0ac13904e1dea38d77a81b14 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Mon, 11 Sep 2023 01:06:11 -0400 Subject: [PATCH 07/40] Fixed names on spawn files. --- .../{0157_typlosion.json => 0157_typhlosion.json} | 4 ++-- .../{0276_tailow.json => 0276_taillow.json} | 4 ++-- .../{0914_quaquavel.json => 0914_quaquaval.json} | 4 ++-- .../{0916_oinkolonge.json => 0916_oinkologne.json} | 12 ++++++------ .../{0945_grafaifai.json => 0945_grafaiai.json} | 4 ++-- .../{0974_cetottle.json => 0974_cetoddle.json} | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0157_typlosion.json => 0157_typhlosion.json} (90%) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0276_tailow.json => 0276_taillow.json} (92%) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0914_quaquavel.json => 0914_quaquaval.json} (86%) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0916_oinkolonge.json => 0916_oinkologne.json} (86%) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0945_grafaifai.json => 0945_grafaiai.json} (89%) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0974_cetottle.json => 0974_cetoddle.json} (87%) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json similarity index 90% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json index 086434ce0c..f4675eae9f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typlosion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "typlosion", - "pokemon": "typlosion", + "id": "typhlosion", + "pokemon": "typhlosion", "presets": [ "natural" ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json similarity index 92% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json index 10b93a18c2..5a4d94441f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_tailow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "tailow", - "pokemon": "tailow", + "id": "taillow", + "pokemon": "taillow", "presets": [ "natural", "treetop" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json similarity index 86% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json index 0a4dc12acf..1d1732ff02 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquavel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "quaquavel", - "pokemon": "quaquavel", + "id": "quaquaval", + "pokemon": "quaquaval", "presets": [ "natural" ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkolonge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json similarity index 86% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkolonge.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json index 3c654f87f5..dc7d5a964c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkolonge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "oinkolonge-1", - "pokemon": "oinkolonge", + "id": "oinkologne-1", + "pokemon": "oinkologne", "presets": [ "natural" ], @@ -29,8 +29,8 @@ } }, { - "id": "oinkolonge-2", - "pokemon": "oinkolonge", + "id": "oinkologne-2", + "pokemon": "oinkologne", "presets": [ "natural" ], @@ -42,8 +42,8 @@ "condition": {} }, { - "id": "oinkolonge-3", - "pokemon": "oinkolonge", + "id": "oinkologne-3", + "pokemon": "oinkologne", "presets": [ "natural" ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json similarity index 89% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json index b0f42ea9b7..08c34e3b17 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaifai.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "grafaifai", - "pokemon": "grafaifai", + "id": "grafaiai", + "pokemon": "grafaiai", "presets": [ "natural", "treetop" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json similarity index 87% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json index f082d50fcb..7db543c5d8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetottle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "cetottle-1", - "pokemon": "cetottle", + "id": "cetoddle-1", + "pokemon": "cetoddle", "presets": [ "natural" ], @@ -22,8 +22,8 @@ } }, { - "id": "cetottle-2", - "pokemon": "cetottle", + "id": "cetoddle-2", + "pokemon": "cetoddle", "presets": [ "natural" ], From 9adeb60abe3ae7bdcb66a4f8ec5bbc8095ffabd6 Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Mon, 11 Sep 2023 04:35:58 -0400 Subject: [PATCH 08/40] Updated spawn files. --- .../spawn_pool_world/0152_chikorita.json | 2 +- .../spawn_pool_world/0153_bayleef.json | 2 +- .../spawn_pool_world/0154_meganium.json | 2 +- .../spawn_pool_world/0155_cyndaquil.json | 2 +- .../spawn_pool_world/0156_quilava.json | 2 +- .../spawn_pool_world/0157_typhlosion.json | 2 +- .../spawn_pool_world/0158_totodile.json | 4 +- .../spawn_pool_world/0159_croconaw.json | 4 +- .../spawn_pool_world/0160_feraligatr.json | 4 +- .../spawn_pool_world/0163_hoothoot.json | 2 +- .../spawn_pool_world/0164_noctowl.json | 2 +- .../spawn_pool_world/0167_spinarak.json | 43 +- .../spawn_pool_world/0168_ariados.json | 43 +- .../spawn_pool_world/0170_chinchou.json | 3 +- .../spawn_pool_world/0171_lanturn.json | 3 +- .../spawn_pool_world/0190_aipom.json | 2 +- .../spawn_pool_world/0194_wooper.json | 12 +- .../spawn_pool_world/0195_quagsire.json | 12 +- .../spawn_pool_world/0207_gligar.json | 10 +- .../spawn_pool_world/0209_snubbull.json | 4 +- .../spawn_pool_world/0210_granbull.json | 4 +- .../spawn_pool_world/0213_shuckle.json | 2 +- .../spawn_pool_world/0216_teddiursa.json | 5 +- .../spawn_pool_world/0217_ursaring.json | 5 +- .../spawn_pool_world/0231_phanpy.json | 4 +- .../spawn_pool_world/0232_donphan.json | 4 +- .../spawn_pool_world/0472_gliscor.json | 6 +- .../spawn_pool_world/0664_scatterbug.json | 388 +---------------- .../spawn_pool_world/0665_spewpa.json | 392 +----------------- .../spawn_pool_world/0666_vivillon.json | 171 +++----- .../tags/worldgen/biome/is_forest.json | 1 - 31 files changed, 195 insertions(+), 947 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json index c46c8622ab..b82d878482 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "chikorita", + "id": "chikorita-1", "pokemon": "chikorita", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json index cfcaa8df44..9a1fa4c33a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "bayleef", + "id": "bayleef-1", "pokemon": "bayleef", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json index 5939a7e8b0..5498d5f45b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "meganium", + "id": "meganium-1", "pokemon": "meganium", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json index b66ed225b0..15e347f005 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0155_cyndaquil.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "cyndaquil", + "id": "cyndaquil-1", "pokemon": "cyndaquil", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json index 9f369a09d6..d287790bdc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0156_quilava.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "quilava", + "id": "quilava-1", "pokemon": "quilava", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json index f4675eae9f..5b3331c94f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "typhlosion", + "id": "typhlosion-1", "pokemon": "typhlosion", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json index 5e2dabb108..4724451d58 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0158_totodile.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "totodile", + "id": "totodile-1", "pokemon": "totodile", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "totodile", + "id": "totodile-2", "pokemon": "totodile", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json index 1cdbce16f6..55eed4c54b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0159_croconaw.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "croconaw", + "id": "croconaw-1", "pokemon": "croconaw", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "croconaw", + "id": "croconaw-2", "pokemon": "croconaw", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json index ccbed983c5..7c93496909 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0160_feraligatr.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "feraligatr", + "id": "feraligatr-1", "pokemon": "feraligatr", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "feraligatr", + "id": "feraligatr-2", "pokemon": "feraligatr", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json index ec9c4cc66a..327fd6c041 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0163_hoothoot.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "hoothoot", + "id": "hoothoot-1", "pokemon": "hoothoot", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json index be5cde412a..e41d9aa473 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0164_noctowl.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "noctowl", + "id": "noctowl-1", "pokemon": "noctowl", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json index 9bab79ff84..932a08bbab 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "spinarak", + "id": "spinarak-1", "pokemon": "spinarak", "presets": [ "natural", @@ -32,7 +32,7 @@ } }, { - "id": "spinarak", + "id": "spinarak-2", "pokemon": "spinarak", "presets": [ "natural" @@ -41,17 +41,21 @@ "context": "grounded", "bucket": "common", "level": "1-25", - "weight": 9.0, + "weight": 1.8, "condition": { "canSeeSky": false, "biomes": [ - "terralith:cave/infested_caves", "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] } }, { - "id": "spinarak", + "id": "spinarak-3", "pokemon": "spinarak", "presets": [ "derelict" @@ -63,6 +67,7 @@ "weight": 5.4, "condition": { "canSeeSky": false, + "minY": 0, "biomes": [ "#cobblemon:is_overworld" ] @@ -74,7 +79,7 @@ } }, { - "id": "spinarak", + "id": "spinarak-4", "pokemon": "spinarak", "presets": [ "natural" @@ -83,16 +88,32 @@ "context": "grounded", "bucket": "common", "level": "1-25", - "weight": 1.8, + "weight": 9.0, "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_overworld" + "terralith:cave/infested_caves" ] - }, - "anticondition": { + } + }, + { + "id": "spinarak-5", + "pokemon": "spinarak", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:cobweb" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json index 211dc7490e..2eb5918166 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "ariados", + "id": "ariados-1", "pokemon": "ariados", "presets": [ "natural", @@ -32,7 +32,7 @@ } }, { - "id": "ariados", + "id": "ariados-2", "pokemon": "ariados", "presets": [ "natural" @@ -41,17 +41,21 @@ "context": "grounded", "bucket": "common", "level": "22-40", - "weight": 1.0, + "weight": 0.2, "condition": { "canSeeSky": false, "biomes": [ - "terralith:cave/infested_caves", "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_abyss" + ] } }, { - "id": "ariados", + "id": "ariados-3", "pokemon": "ariados", "presets": [ "derelict" @@ -63,6 +67,7 @@ "weight": 0.6, "condition": { "canSeeSky": false, + "minY": 0, "biomes": [ "#cobblemon:is_overworld" ] @@ -74,7 +79,7 @@ } }, { - "id": "ariados", + "id": "ariados-4", "pokemon": "ariados", "presets": [ "natural" @@ -83,16 +88,32 @@ "context": "grounded", "bucket": "common", "level": "22-40", - "weight": 0.2, + "weight": 1.0, "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_overworld" + "terralith:cave/infested_caves" ] - }, - "anticondition": { + } + }, + { + "id": "ariados-5", + "pokemon": "ariados", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 1.0, + "condition": { + "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:cobweb" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json index 04d5a999d5..5aae2f4825 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "chinchou", + "id": "chinchou-1", "pokemon": "chinchou", "presets": [ "underwater" @@ -16,6 +16,7 @@ "weight": 5.4, "condition": { "canSeeSky": true, + "maxY": 48, "biomes": [ "#cobblemon:is_deep" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json index 427ce666c9..52be5023b6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "lanturn", + "id": "lanturn-1", "pokemon": "lanturn", "presets": [ "underwater" @@ -16,6 +16,7 @@ "weight": 0.6, "condition": { "canSeeSky": true, + "maxY": 48, "biomes": [ "#cobblemon:is_deep" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json index 909919a30f..5f0f27f53b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "aipom", + "id": "aipom-1", "pokemon": "aipom", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json index 407c518d7a..f6b9d3d085 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "wooper", + "id": "wooper-1", "pokemon": "wooper", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "wooper", + "id": "wooper-2", "pokemon": "wooper", "presets": [ "underwater" @@ -40,7 +40,7 @@ } }, { - "id": "wooper", + "id": "wooper-3", "pokemon": "wooper", "presets": [ "natural" @@ -63,7 +63,7 @@ } }, { - "id": "wooper", + "id": "wooper-4", "pokemon": "wooper", "presets": [ "underwater" @@ -86,7 +86,7 @@ } }, { - "id": "wooper", + "id": "wooper-5", "pokemon": "wooper", "presets": [ "natural" @@ -112,7 +112,7 @@ } }, { - "id": "wooper", + "id": "wooper-6", "pokemon": "wooper", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json index 4ccca3251d..2713c5bfa4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "quagsire", + "id": "quagsire-1", "pokemon": "quagsire", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "quagsire", + "id": "quagsire-2", "pokemon": "quagsire", "presets": [ "underwater" @@ -40,7 +40,7 @@ } }, { - "id": "quagsire", + "id": "quagsire-3", "pokemon": "quagsire", "presets": [ "natural" @@ -63,7 +63,7 @@ } }, { - "id": "quagsire", + "id": "quagsire-4", "pokemon": "quagsire", "presets": [ "underwater" @@ -86,7 +86,7 @@ } }, { - "id": "quagsire", + "id": "quagsire-5", "pokemon": "quagsire", "presets": [ "natural" @@ -110,7 +110,7 @@ } }, { - "id": "quagsire", + "id": "quagsire-6", "pokemon": "quagsire", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json index 3aae19661c..844668747a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "gligar", + "id": "gligar-1", "pokemon": "gligar", "presets": [ "natural", @@ -24,7 +24,7 @@ } }, { - "id": "gligar", + "id": "gligar-2", "pokemon": "gligar", "presets": [ "natural" @@ -34,7 +34,11 @@ "bucket": "common", "level": "18-43", "weight": 1.8, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_mountain" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json index f6d060dd65..e9bbf9b41d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "snubbull", + "id": "snubbull-1", "pokemon": "snubbull", "presets": [ "natural", @@ -28,7 +28,7 @@ } }, { - "id": "snubbull", + "id": "snubbull-2", "pokemon": "snubbull", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json index 3c01c81b4d..e44372c347 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "granbull", + "id": "granbull-1", "pokemon": "granbull", "presets": [ "natural", @@ -28,7 +28,7 @@ } }, { - "id": "granbull", + "id": "granbull-2", "pokemon": "granbull", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json index fc1fb3437d..0f514d41fb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "shuckle", + "id": "shuckle-1", "pokemon": "shuckle", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json index 5e8e01a942..d6d3904918 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "teddiursa", + "id": "teddiursa-1", "pokemon": "teddiursa", "presets": [ "natural" @@ -19,7 +19,8 @@ "#cobblemon:is_forest", "#cobblemon:is_mountain", "#cobblemon:is_taiga" - ] + ], + "minY": 48 } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json index 8acf54f06d..30df33ebe0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "ursaring", + "id": "ursaring-1", "pokemon": "ursaring", "presets": [ "natural" @@ -19,7 +19,8 @@ "#cobblemon:is_forest", "#cobblemon:is_mountain", "#cobblemon:is_taiga" - ] + ], + "minY": 48 } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json index db9a9178fd..cbdfe313bb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "phanpy", + "id": "phanpy-1", "pokemon": "phanpy", "presets": [ "natural" @@ -28,7 +28,7 @@ } }, { - "id": "phanpy", + "id": "phanpy-2", "pokemon": "phanpy", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json index 35331e0907..17508a7f16 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "donphan", + "id": "donphan-1", "pokemon": "donphan", "presets": [ "natural" @@ -28,7 +28,7 @@ } }, { - "id": "donphan", + "id": "donphan-2", "pokemon": "donphan", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json index 40a95374e5..06c7691a67 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json @@ -34,7 +34,11 @@ "bucket": "common", "level": "38-51", "weight": 0.2, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_mountain" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json index 697c87b798..fefedc0424 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json @@ -8,8 +8,7 @@ "pokemon": "scatterbug", "presets": [ "natural", - "foliage", - "flowers" + "foliage" ], "type": "pokemon", "context": "grounded", @@ -19,388 +18,9 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_badlands" - ] - } - }, - { - "id": "scatterbug-2", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "minecraft:cherry_grove", - "#cobblemon:is_magical" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "scatterbug-3", - "pokemon": "scatterbug", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast", - "#cobblemon:is_reef" - ] - } - }, - { - "id": "scatterbug-4", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - }, - { - "id": "scatterbug-5", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "biomes": [ - "minecraft:end_highlands" - ] - } - }, - { - "id": "scatterbug-6", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - }, - "anticondition": { - "biomes": [ - "minecraft:sunflower_plains" - ] - } - }, - { - "id": "scatterbug-7", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - }, - { - "id": "scatterbug-8", - "pokemon": "scatterbug", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true - } - }, - { - "id": "scatterbug-9", - "pokemon": "scatterbug", - "presets": [ - "natural", - "freshwater" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_frozen" - ] - } - }, - { - "id": "scatterbug-10", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_glacial", - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" - ] - } - }, - { - "id": "scatterbug-11", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - }, - { - "id": "scatterbug-12", - "pokemon": "scatterbug", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - }, - { - "id": "scatterbug-13", - "pokemon": "scatterbug", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mushroom" - ] - } - }, - { - "id": "scatterbug-14", - "pokemon": "scatterbug", - "presets": [ - "natural", - "treetop" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": {} - }, - { - "id": "scatterbug-15", - "pokemon": "scatterbug", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - }, - { - "id": "scatterbug-16", - "pokemon": "scatterbug", - "presets": [ - "natural", - "urban", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_overworld" - ] - } - }, - { - "id": "scatterbug-17", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ] - } - }, - { - "id": "scatterbug-18", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - }, - { - "id": "scatterbug-19", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_sky", - "minecraft:sunflower_plains" - ] - } - }, - { - "id": "scatterbug-20", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "scatterbug-21", - "pokemon": "scatterbug", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_taiga" + "#cobblemon:is_floral", + "#cobblemon:is_plains", + "#cobblemon:is_savanna" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json index a86962029e..6a7a45d6d9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json @@ -8,401 +8,19 @@ "pokemon": "spewpa", "presets": [ "natural", - "foliage", - "flowers" + "foliage" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "9-21", - "weight": 2.0, + "weight": 3.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_badlands" - ] - } - }, - { - "id": "spewpa-2", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "minecraft:cherry_grove", - "#cobblemon:is_magical" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "spewpa-3", - "pokemon": "spewpa", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast", - "#cobblemon:is_reef" - ] - } - }, - { - "id": "spewpa-4", - "pokemon": "spewpa", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - }, - { - "id": "spewpa-5", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "biomes": [ - "minecraft:end_highlands" - ] - } - }, - { - "id": "spewpa-6", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - }, - "anticondition": { - "biomes": [ - "minecraft:sunflower_plains" - ] - } - }, - { - "id": "spewpa-7", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - }, - { - "id": "spewpa-8", - "pokemon": "spewpa", - "presets": [ - "natural", - "freshwater" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true - } - }, - { - "id": "spewpa-9", - "pokemon": "spewpa", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_frozen" - ] - } - }, - { - "id": "spewpa-10", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_glacial", - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" - ] - } - }, - { - "id": "spewpa-11", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - }, - { - "id": "spewpa-12", - "pokemon": "spewpa", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - }, - { - "id": "spewpa-13", - "pokemon": "spewpa", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mushroom" - ] - } - }, - { - "id": "spewpa-14", - "pokemon": "spewpa", - "presets": [ - "natural", - "treetop" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": {} - }, - { - "id": "spewpa-15", - "pokemon": "spewpa", - "presets": [ - "natural", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - }, - { - "id": "spewpa-16", - "pokemon": "spewpa", - "presets": [ - "natural", - "urban", - "foliage", - "flowers" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_overworld" - ] - } - }, - { - "id": "spewpa-17", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ] - } - }, - { - "id": "spewpa-18", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - }, - { - "id": "spewpa-19", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_sky", - "minecraft:sunflower_plains" - ] - } - }, - { - "id": "spewpa-20", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "spewpa-21", - "pokemon": "spewpa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "9-21", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_taiga" + "#cobblemon:is_floral", + "#cobblemon:is_plains", + "#cobblemon:is_savanna" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json index caaa4d7a7a..bc102bf51b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json @@ -4,66 +4,58 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "vivillon[highplains]", + "id": "vivillon-highplains-1", "pokemon": "vivillon vivillon_wings=high_plains", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_badlands" ], - "timeRange": "day", - "isRaining": false + "timeRange": "day" } }, { - "id": "vivillon[fancy]", + "id": "vivillon-fancy-1", "pokemon": "vivillon vivillon_wings=fancy", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ - "minecraft:cherry_grove", - "#cobblemon:is_magical" + "minecraft:cherry_grove" ], "timeRange": "day", "isRaining": false - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] } }, { - "id": "vivillon[ocean]", + "id": "vivillon-ocean-1", "pokemon": "vivillon vivillon_wings=ocean", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -75,55 +67,37 @@ } }, { - "id": "vivillon[sandstorm]", + "id": "vivillon-sandstorm-1", "pokemon": "vivillon vivillon_wings=sandstorm", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_desert" ], - "timeRange": "day", - "isRaining": false - } - }, - { - "id": "vivillon[ender]", - "pokemon": "vivillon vivillon_wings=ender", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "12-41", - "weight": 1.0, - "condition": { - "biomes": [ - "minecraft:end_highlands" - ] + "timeRange": "day" } }, { - "id": "vivillon[meadow]", + "id": "vivillon-meadow-1", "pokemon": "vivillon vivillon_wings=meadow", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -131,24 +105,20 @@ ], "timeRange": "day", "isRaining": false - }, - "anticondition": { - "biomes": [ - "minecraft:sunflower_plains" - ] } }, { - "id": "vivillon[garden]", + "id": "vivillon-garden-1", "pokemon": "vivillon vivillon_wings=garden", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -159,17 +129,18 @@ } }, { - "id": "vivillon[river]", + "id": "vivillon-river-1", "pokemon": "vivillon vivillon_wings=river", "presets": [ "natural", - "freshwater" + "freshwater", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "timeRange": "day", @@ -177,18 +148,17 @@ } }, { - "id": "vivillon[polar]", + "id": "vivillon-polar-1", "pokemon": "vivillon vivillon_wings=polar", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -199,18 +169,17 @@ } }, { - "id": "vivillon[tundra]", + "id": "vivillon-tundra-1", "pokemon": "vivillon vivillon_wings=tundra", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -223,16 +192,17 @@ } }, { - "id": "vivillon[jungle]", + "id": "vivillon-jungle-1", "pokemon": "vivillon vivillon_wings=jungle", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -243,18 +213,17 @@ } }, { - "id": "vivillon[monsoon]", + "id": "vivillon-monsoon-1", "pokemon": "vivillon vivillon_wings=monsoon", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -265,18 +234,17 @@ } }, { - "id": "vivillon[archipelago]", + "id": "vivillon-archipelago-1", "pokemon": "vivillon vivillon_wings=archipelago", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -287,32 +255,17 @@ } }, { - "id": "vivillon[nether]", - "pokemon": "vivillon vivillon_wings=nether", - "presets": [ - "natural", - "treetop" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "12-41", - "weight": 1.0, - "condition": {} - }, - { - "id": "vivillon[marine]", + "id": "vivillon-marine-1", "pokemon": "vivillon vivillon_wings=marine", "presets": [ "natural", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -323,19 +276,18 @@ } }, { - "id": "vivillon[modern]", + "id": "vivillon-modern-1", "pokemon": "vivillon vivillon_wings=modern", "presets": [ "natural", "urban", - "foliage", "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -346,16 +298,17 @@ } }, { - "id": "vivillon[continental]", + "id": "vivillon-continental-1", "pokemon": "vivillon vivillon_wings=continental", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -366,36 +319,37 @@ } }, { - "id": "vivillon[savanna]", + "id": "vivillon-savanna-1", "pokemon": "vivillon vivillon_wings=savanna", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_savanna" ], - "timeRange": "day", - "isRaining": false + "timeRange": "day" } }, { - "id": "vivillon[sun]", + "id": "vivillon-sun-1", "pokemon": "vivillon vivillon_wings=sun", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ @@ -407,36 +361,39 @@ } }, { - "id": "vivillon[elegant]", + "id": "vivillon-elegant-1", "pokemon": "vivillon vivillon_wings=elegant", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_magical", + "#cobblemon:is_spooky" ], "timeRange": "day", "isRaining": false } }, { - "id": "vivillon[icysnow]", + "id": "vivillon-icysnow-1", "pokemon": "vivillon vivillon_wings=icysnow", "presets": [ - "natural" + "natural", + "flowers" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "12-41", - "weight": 1.0, + "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json index e9b7e34691..7eeeac67df 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:cherry_grove", "#minecraft:is_forest", { "id": "terralith:alpha_islands", From 547af6dd776725a5888e1411133b903eb035b21e Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:02:10 -0400 Subject: [PATCH 09/40] Fixed spawn files. --- .../spawn_pool_world/0194_wooper.json | 83 +++++++++++++++++-- .../spawn_pool_world/0261_poochyena.json | 4 +- .../spawn_pool_world/0262_mightyena.json | 4 +- .../spawn_pool_world/0263_zigzagoon.json | 27 +++++- .../spawn_pool_world/0264_linoone.json | 27 +++++- .../spawn_pool_world/0276_taillow.json | 2 +- .../spawn_pool_world/0277_swellow.json | 2 +- .../spawn_pool_world/0278_wingull.json | 2 +- .../spawn_pool_world/0279_pelipper.json | 2 +- .../spawn_pool_world/0280_ralts.json | 6 +- .../spawn_pool_world/0281_kirlia.json | 6 +- .../spawn_pool_world/0282_gardevoir.json | 6 +- .../spawn_pool_world/0283_surskit.json | 2 +- .../spawn_pool_world/0284_masquerain.json | 2 +- .../spawn_pool_world/0290_nincada.json | 4 +- .../spawn_pool_world/0291_ninjask.json | 3 +- .../spawn_pool_world/0292_shedinja.json | 3 +- .../spawn_pool_world/0313_volbeat.json | 4 +- .../spawn_pool_world/0314_illumise.json | 4 +- .../spawn_pool_world/0322_numel.json | 13 ++- .../spawn_pool_world/0323_camerupt.json | 13 ++- .../spawn_pool_world/0331_cacnea.json | 2 +- .../spawn_pool_world/0332_cacturne.json | 2 +- .../spawn_pool_world/0339_barboach.json | 2 +- .../spawn_pool_world/0340_whiscash.json | 2 +- .../spawn_pool_world/0355_duskull.json | 12 ++- .../spawn_pool_world/0356_dusclops.json | 12 ++- .../spawn_pool_world/0358_chimecho.json | 4 +- .../spawn_pool_world/0366_clamperl.json | 1 + .../spawn_pool_world/0367_huntail.json | 1 + .../spawn_pool_world/0368_gorebyss.json | 1 + .../spawn_pool_world/0369_relicanth.json | 1 + .../spawn_pool_world/0396_starly.json | 2 +- .../spawn_pool_world/0397_staravia.json | 2 +- .../spawn_pool_world/0398_staraptor.json | 2 +- .../spawn_pool_world/0403_shinx.json | 2 +- .../spawn_pool_world/0404_luxio.json | 2 +- .../spawn_pool_world/0405_luxray.json | 2 +- .../spawn_pool_world/0415_combee.json | 9 +- .../spawn_pool_world/0416_vespiquen.json | 9 +- .../spawn_pool_world/0424_ambipom.json | 2 +- .../spawn_pool_world/0477_dusknoir.json | 6 +- .../spawn_pool_world/0504_patrat.json | 2 +- .../spawn_pool_world/0505_watchog.json | 2 +- .../spawn_pool_world/0506_lillipup.json | 2 +- .../spawn_pool_world/0507_herdier.json | 2 +- .../spawn_pool_world/0508_stoutland.json | 2 +- .../spawn_pool_world/0519_pidove.json | 6 ++ .../spawn_pool_world/0520_tranquill.json | 6 ++ .../spawn_pool_world/0521_unfezant.json | 6 ++ .../spawn_pool_world/0524_roggenrola.json | 3 +- .../spawn_pool_world/0525_boldore.json | 3 +- .../spawn_pool_world/0526_gigalith.json | 3 +- .../spawn_pool_world/0532_timburr.json | 7 +- .../spawn_pool_world/0533_gurdurr.json | 7 +- .../spawn_pool_world/0534_conkeldurr.json | 7 +- .../spawn_pool_world/0543_venipede.json | 7 +- .../spawn_pool_world/0544_whirlipede.json | 7 +- .../spawn_pool_world/0545_scolipede.json | 7 +- .../spawn_pool_world/0546_cottonee.json | 2 +- .../spawn_pool_world/0547_whimsicott.json | 2 +- .../spawn_pool_world/0562_yamask.json | 1 + .../spawn_pool_world/0563_cofagrigus.json | 1 + .../spawn_pool_world/0595_joltik.json | 6 ++ .../spawn_pool_world/0596_galvantula.json | 6 ++ .../spawn_pool_world/0626_bouffalant.json | 2 +- .../spawn_pool_world/0659_bunnelby.json | 2 +- .../spawn_pool_world/0660_diggersby.json | 2 +- .../spawn_pool_world/0661_fletchling.json | 5 +- .../spawn_pool_world/0662_fletchinder.json | 5 +- .../spawn_pool_world/0663_talonflame.json | 5 +- .../spawn_pool_world/0690_skrelp.json | 5 +- .../spawn_pool_world/0691_dragalge.json | 5 +- .../spawn_pool_world/0708_phantump.json | 12 ++- .../spawn_pool_world/0709_trevenant.json | 12 ++- .../spawn_pool_world/0712_bergmite.json | 16 ++++ .../spawn_pool_world/0713_avalugg.json | 16 ++++ .../spawn_pool_world/0739_crabrawler.json | 2 +- .../spawn_pool_world/0749_mudbray.json | 2 +- .../spawn_pool_world/0750_mudsdale.json | 2 +- .../spawn_pool_world/0755_morelull.json | 17 ++++ .../spawn_pool_world/0756_shiinotic.json | 17 ++++ .../spawn_pool_world/0767_wimpod.json | 5 ++ .../spawn_pool_world/0768_golisopod.json | 5 ++ .../spawn_pool_world/0771_pyukumuku.json | 1 + .../spawn_pool_world/0775_komala.json | 3 +- .../spawn_pool_world/0821_rookidee.json | 2 +- .../spawn_pool_world/0822_corvisquire.json | 2 +- .../spawn_pool_world/0823_corviknight.json | 2 +- .../spawn_pool_world/0835_yamper.json | 2 +- .../spawn_pool_world/0836_boltund.json | 2 +- .../spawn_pool_world/0846_arrokuda.json | 2 +- .../spawn_pool_world/0847_barraskewda.json | 2 +- .../spawn_pool_world/0862_obstagoon.json | 2 +- .../spawn_pool_world/0863_perrserker.json | 2 +- .../spawn_pool_world/0865_sirfetchd.json | 2 +- .../spawn_pool_world/0901_ursaluna.json | 5 +- .../spawn_pool_world/0906_sprigatito.json | 11 ++- .../spawn_pool_world/0907_floragato.json | 11 ++- .../spawn_pool_world/0909_fuecoco.json | 6 +- .../spawn_pool_world/0910_crocalor.json | 6 +- .../spawn_pool_world/0911_skeledirge.json | 6 +- .../spawn_pool_world/0912_quaxly.json | 5 +- .../spawn_pool_world/0913_quaxwell.json | 5 +- .../spawn_pool_world/0914_quaquaval.json | 5 +- .../spawn_pool_world/0915_lechonk.json | 18 +++- .../spawn_pool_world/0916_oinkologne.json | 18 +++- .../spawn_pool_world/0924_tandemaus.json | 2 +- .../spawn_pool_world/0925_maushold.json | 2 +- .../spawn_pool_world/0926_fidough.json | 2 +- .../spawn_pool_world/0927_dachsbun.json | 2 +- .../spawn_pool_world/0931_squawkabilly.json | 6 ++ .../spawn_pool_world/0932_nacli.json | 22 ++++- .../spawn_pool_world/0933_naclstack.json | 22 ++++- .../spawn_pool_world/0934_garganacl.json | 22 ++++- .../spawn_pool_world/0942_maschiff.json | 4 +- .../spawn_pool_world/0943_mabosstiff.json | 4 +- .../spawn_pool_world/0944_shroodle.json | 2 +- .../spawn_pool_world/0945_grafaiai.json | 2 +- .../spawn_pool_world/0955_flittle.json | 2 +- .../spawn_pool_world/0956_espathra.json | 2 +- .../spawn_pool_world/0957_tinkatink.json | 2 +- .../spawn_pool_world/0958_tinkatuff.json | 2 +- .../spawn_pool_world/0959_tinkaton.json | 2 +- .../spawn_pool_world/0965_varoom.json | 18 ++++ .../spawn_pool_world/0966_revavroom.json | 18 ++++ .../spawn_pool_world/0969_glimmet.json | 9 +- .../spawn_pool_world/0970_glimmora.json | 9 +- .../spawn_pool_world/0979_annihilape.json | 2 +- .../spawn_pool_world/0980_clodsire.json | 43 +++++++++- .../tags/worldgen/biome/is_forest.json | 1 + 131 files changed, 701 insertions(+), 152 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json index f6b9d3d085..3d99a500bc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -99,9 +99,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_swamp", - "minecraft:mangrove_swamp", - "#cobblemon:is_savanna" + "#cobblemon:is_swamp" ], "isRaining": true }, @@ -125,9 +123,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_swamp", - "minecraft:mangrove_swamp", - "#cobblemon:is_savanna" + "#cobblemon:is_swamp" ] }, "anticondition": { @@ -135,6 +131,81 @@ "minecraft:mangrove_swamp" ] } + }, + { + "id": "wooper-paldean-1", + "pokemon": "wooper paldean", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + }, + { + "id": "wooper-paldean-2", + "pokemon": "wooper paldean", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + }, + { + "id": "wooper-paldean-3", + "pokemon": "wooper paldean", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_savanna" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "wooper-paldean-4", + "pokemon": "wooper paldean", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "1-21", + "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/0261_poochyena.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json index 9de650adac..35dbdb132b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "poochyena", + "id": "poochyena-1", "pokemon": "poochyena", "presets": [ "natural" @@ -24,7 +24,7 @@ } }, { - "id": "poochyena", + "id": "poochyena-2", "pokemon": "poochyena", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json index a6c95a7be8..f7d0b789aa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "mightyena", + "id": "mightyena-1", "pokemon": "mightyena", "presets": [ "natural" @@ -24,7 +24,7 @@ } }, { - "id": "mightyena", + "id": "mightyena-2", "pokemon": "mightyena", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json index 810afcbdc9..0ec7847877 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "zigzagoon", + "id": "zigzagoon-1", "pokemon": "zigzagoon", "presets": [ "natural" @@ -23,7 +23,30 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_temperate", + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "zigzagoon-galarian-1", + "pokemon": "zigzagoon galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ "#cobblemon:is_taiga" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json index b34d85ccf9..c9afa60348 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "linoone", + "id": "linoone-1", "pokemon": "linoone", "presets": [ "natural" @@ -23,7 +23,30 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_temperate", + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "linoone-galarian-1", + "pokemon": "linoone galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-42", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ "#cobblemon:is_taiga" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json index 5a4d94441f..2b75a84ce4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "taillow", + "id": "taillow-1", "pokemon": "taillow", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json index f062fa3610..e1dd89535b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "swellow", + "id": "swellow-1", "pokemon": "swellow", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json index 56dac0ee39..8bfb63b1c6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "wingull", + "id": "wingull-1", "pokemon": "wingull", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json index 017d2826e8..a19fcace42 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "pelipper", + "id": "pelipper-1", "pokemon": "pelipper", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json index 9fd5b28043..a90adcc88f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "ralts", + "id": "ralts-1", "pokemon": "ralts", "presets": [ "natural" @@ -24,7 +24,7 @@ } }, { - "id": "ralts", + "id": "ralts-2", "pokemon": "ralts", "presets": [ "natural", @@ -43,7 +43,7 @@ } }, { - "id": "ralts", + "id": "ralts-3", "pokemon": "ralts", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json index 785ea419db..a49e69c252 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "kirlia", + "id": "kirlia-1", "pokemon": "kirlia", "presets": [ "natural" @@ -24,7 +24,7 @@ } }, { - "id": "kirlia", + "id": "kirlia-2", "pokemon": "kirlia", "presets": [ "natural", @@ -43,7 +43,7 @@ } }, { - "id": "kirlia", + "id": "kirlia-3", "pokemon": "kirlia", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json index 85bd997cf8..bf40863d9a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "gardevoir", + "id": "gardevoir-1", "pokemon": "gardevoir", "presets": [ "natural" @@ -24,7 +24,7 @@ } }, { - "id": "gardevoir", + "id": "gardevoir-2", "pokemon": "gardevoir", "presets": [ "natural", @@ -43,7 +43,7 @@ } }, { - "id": "gardevoir", + "id": "gardevoir-3", "pokemon": "gardevoir", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json index be8a8196b6..bceffb181d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "surskit", + "id": "surskit-1", "pokemon": "surskit", "presets": [ "water_surface", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json index f97d30c1ef..766c8cc7cb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "masquerain", + "id": "masquerain-1", "pokemon": "masquerain", "presets": [ "water_surface", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json index 41158468f5..3c26dd0388 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "nincada", + "id": "nincada-1", "pokemon": "nincada", "presets": [ "natural" @@ -16,6 +16,7 @@ "weight": 10.0, "condition": { "canSeeSky": false, + "minY": 32, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_jungle" @@ -23,7 +24,6 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss", "#cobblemon:is_abyss" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json index 94cde7025b..f826b2b7b0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "ninjask", + "id": "ninjask-1", "pokemon": "ninjask", "presets": [ "natural" @@ -25,7 +25,6 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_freezing", "#cobblemon:is_freezing" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json index b0e245dc73..0d22cefd2b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "shedinja", + "id": "shedinja-1", "pokemon": "shedinja", "presets": [ "natural" @@ -25,7 +25,6 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_freezing", "#cobblemon:is_freezing" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json index ee5061f5e3..ddc049c058 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "volbeat", + "id": "volbeat-1", "pokemon": "volbeat", "presets": [ "natural", @@ -22,7 +22,7 @@ } }, { - "id": "volbeat", + "id": "volbeat-2", "pokemon": "volbeat", "presets": [ "water_surface" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json index 5099eabde4..baa0ca1387 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "illumise", + "id": "illumise-1", "pokemon": "illumise", "presets": [ "natural", @@ -22,7 +22,7 @@ } }, { - "id": "illumise", + "id": "illumise-2", "pokemon": "illumise", "presets": [ "water_surface" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json index 57e0fe9916..4c425d2fd0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "numel", + "id": "numel-1", "pokemon": "numel", "presets": [ "natural" @@ -28,7 +28,7 @@ } }, { - "id": "numel", + "id": "numel-2", "pokemon": "numel", "presets": [ "natural" @@ -38,10 +38,15 @@ "bucket": "common", "level": "6-31", "weight": 5.4, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" + ] + } }, { - "id": "numel", + "id": "numel-3", "pokemon": "numel", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json index 578a430412..df26279e6d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "camerupt", + "id": "camerupt-1", "pokemon": "camerupt", "presets": [ "natural" @@ -28,7 +28,7 @@ } }, { - "id": "camerupt", + "id": "camerupt-2", "pokemon": "camerupt", "presets": [ "natural" @@ -38,10 +38,15 @@ "bucket": "common", "level": "33-46", "weight": 0.6, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" + ] + } }, { - "id": "camerupt", + "id": "camerupt-3", "pokemon": "camerupt", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json index 6a8ca5f21b..49db18cb0d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "cacnea", + "id": "cacnea-1", "pokemon": "cacnea", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json index 00dd70aedf..da77746106 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "cacturne", + "id": "cacturne-1", "pokemon": "cacturne", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json index 1694ba8dc4..ec6f79ac09 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0339_barboach.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "barboach", + "id": "barboach-1", "pokemon": "barboach", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json index 8a77994f3b..f2990e1e85 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "whiscash", + "id": "whiscash-1", "pokemon": "whiscash", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json index 2146b9e019..3e68fb61f5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "duskull", + "id": "duskull-1", "pokemon": "duskull", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "duskull", + "id": "duskull-2", "pokemon": "duskull", "presets": [ "natural" @@ -32,10 +32,14 @@ "bucket": "common", "level": "5-30", "weight": 9.0, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_soul_sand" + ] + } }, { - "id": "duskull", + "id": "duskull-3", "pokemon": "duskull", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json index bd8a5b788d..d2d7f29476 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "dusclops", + "id": "dusclops-1", "pokemon": "dusclops", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "dusclops", + "id": "dusclops-2", "pokemon": "dusclops", "presets": [ "natural" @@ -32,10 +32,14 @@ "bucket": "common", "level": "37-46", "weight": 0.9, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_soul_sand" + ] + } }, { - "id": "dusclops", + "id": "dusclops-3", "pokemon": "dusclops", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json index a5d1c6e5f5..477c593bac 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "chimecho", + "id": "chimecho-1", "pokemon": "chimecho", "type": "pokemon", "context": "grounded", @@ -23,7 +23,7 @@ } }, { - "id": "chimecho", + "id": "chimecho-2", "pokemon": "chimecho", "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json index 619d40fc4b..2cbab86493 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json @@ -16,6 +16,7 @@ "weight": 9.0, "condition": { "canSeeSky": true, + "maxY": 48, "biomes": [ "#cobblemon:is_deep" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json index 7ae25bc566..d726e73ffc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json @@ -16,6 +16,7 @@ "weight": 0.5, "condition": { "canSeeSky": true, + "maxY": 48, "biomes": [ "#cobblemon:is_deep" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json index 112f23c8ec..f3c7bea441 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json @@ -16,6 +16,7 @@ "weight": 0.5, "condition": { "canSeeSky": true, + "maxY": 48, "biomes": [ "#cobblemon:is_deep" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json index 7fd2359b1f..ff06580b79 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json @@ -15,6 +15,7 @@ "level": "24-49", "weight": 2.0, "condition": { + "maxY": 48, "biomes": [ "#cobblemon:is_deep" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json index 8ddbd96327..e34f9e0852 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0396_starly.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "starly", + "id": "starly-1", "pokemon": "starly", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json index f257b75583..012fbdc678 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0397_staravia.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "staravia", + "id": "staravia-1", "pokemon": "staravia", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json index 8f485dce9b..88ed03351f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0398_staraptor.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "staraptor", + "id": "staraptor-1", "pokemon": "staraptor", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json index 97dfbd65c3..b0c6621ad5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "shinx", + "id": "shinx-1", "pokemon": "shinx", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json index f18dc2d072..19aa30a776 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "luxio", + "id": "luxio-1", "pokemon": "luxio", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json index eaee9c0738..e8e5e23a57 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "luxray", + "id": "luxray-1", "pokemon": "luxray", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json index e45225569d..28cf1ae516 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "combee", + "id": "combee-1", "pokemon": "combee", "presets": [ "natural" @@ -18,7 +18,7 @@ "multiplier": 25.0, "condition": { "neededNearbyBlocks": [ - "#minecraft:bee_nest" + "#minecraft:beehives" ] } }, @@ -29,6 +29,11 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json index 012bed3883..b7c0b3a827 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "vespiquen", + "id": "vespiquen-1", "pokemon": "vespiquen", "presets": [ "natural" @@ -18,7 +18,7 @@ "multiplier": 25.0, "condition": { "neededNearbyBlocks": [ - "#minecraft:bee_nest" + "#minecraft:beehives" ] } }, @@ -29,6 +29,11 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json index f9bab26498..0c6be11d76 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "ambipom", + "id": "ambipom-1", "pokemon": "ambipom", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json index e07160ab36..94c9cd26c5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json @@ -32,7 +32,11 @@ "bucket": "common", "level": "41-53", "weight": 0.1, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_soul_sand" + ] + } }, { "id": "dusknoir-3", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json index 102a8fd12d..200cd827a3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "patrat", + "id": "patrat-1", "pokemon": "patrat", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json index 2789f90533..02b66a0325 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0505_watchog.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "watchog", + "id": "watchog-1", "pokemon": "watchog", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json index 7e2666995d..623f7f0bbc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "lillipup", + "id": "lillipup-1", "pokemon": "lillipup", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json index be1f526d92..66b7aee9d7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "herdier", + "id": "herdier-1", "pokemon": "herdier", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json index f3b5885385..1c6d904691 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "stoutland", + "id": "stoutland-1", "pokemon": "stoutland", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json index 5a4bf1df45..d1b2b85bb2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json @@ -41,6 +41,12 @@ "#cobblemon:is_overworld" ], "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json index e5ed1be75a..8d03e8ad23 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json @@ -41,6 +41,12 @@ "#cobblemon:is_overworld" ], "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json index 49a5b94a86..a6cee273d6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json @@ -41,6 +41,12 @@ "#cobblemon:is_overworld" ], "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json index 7500d2f111..5a36dfb877 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "roggenrola", + "id": "roggenrola-1", "pokemon": "roggenrola", "presets": [ "natural" @@ -16,6 +16,7 @@ "weight": 9.0, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json index 41978a9099..75f7d07d43 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "boldore", + "id": "boldore-1", "pokemon": "boldore", "presets": [ "natural" @@ -16,6 +16,7 @@ "weight": 0.9, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json index 7013b1a8aa..cc56a3c3ed 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "gigalith", + "id": "gigalith-1", "pokemon": "gigalith", "presets": [ "natural" @@ -16,6 +16,7 @@ "weight": 0.1, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json index 450a7aa014..31f4e570a4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "timburr", + "id": "timburr-1", "pokemon": "timburr", "presets": [ "natural", @@ -26,6 +26,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json index a22bd1a2f9..0a561bba66 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "gurdurr", + "id": "gurdurr-1", "pokemon": "gurdurr", "presets": [ "natural", @@ -26,6 +26,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json index 5eb14f9865..aafa997165 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "conkeldurr", + "id": "conkeldurr-1", "pokemon": "conkeldurr", "presets": [ "natural", @@ -26,6 +26,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json index bb028426e4..257eb2b05e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json @@ -70,7 +70,12 @@ "bucket": "common", "level": "1-26", "weight": 5.4, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_fungus" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json index 76d08f8cdf..448f0fa2c0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json @@ -70,7 +70,12 @@ "bucket": "common", "level": "22-36", "weight": 0.54, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_fungus" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json index de65d82b8e..3519809798 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json @@ -70,7 +70,12 @@ "bucket": "common", "level": "30-49", "weight": 0.06, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_fungus" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json index d85bfe55c3..2006f8ac2f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "cottonee", + "id": "cottonee-1", "pokemon": "cottonee", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json index 168272ea77..0229ccece7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "whimsicott", + "id": "whimsicott-1", "pokemon": "whimsicott", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json index c5c9e4dba7..655c64b1ad 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json @@ -16,6 +16,7 @@ "weight": 1.8, "condition": { "canSeeSky": false, + "minY": 0, "biomes": [ "#cobblemon:is_desert" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json index 1b88da0c46..07a7236080 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json @@ -16,6 +16,7 @@ "weight": 0.2, "condition": { "canSeeSky": false, + "minY": 0, "biomes": [ "#cobblemon:is_desert" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json index 146da68b35..03dfae3cdb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "7-32", "weight": 5.4, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json index 0706da634a..9fbe88ab28 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0596_galvantula.json @@ -14,6 +14,12 @@ "bucket": "common", "level": "36-47", "weight": 0.6, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json index 12eb05f823..74a8a7d2f2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "bouffalant", + "id": "bouffalant-1", "pokemon": "bouffalant", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json index 05acfe84ca..995d63f453 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "bunnelby", + "id": "bunnelby-1", "pokemon": "bunnelby", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json index fe1bac0cc3..a978fa3507 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0660_diggersby.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "diggersby", + "id": "diggersby-1", "pokemon": "diggersby", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json index 447cfdc38f..56a5260372 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json @@ -38,7 +38,10 @@ "level": "3-28", "weight": 5.4, "condition": { - "canSeeSky": true + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_fungus" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json index 4c2be78a70..6630ec9164 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json @@ -38,7 +38,10 @@ "level": "17-38", "weight": 0.54, "condition": { - "canSeeSky": true + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_fungus" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json index c0b21f2378..7ccd9f88b4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json @@ -38,7 +38,10 @@ "level": "35-50", "weight": 0.06, "condition": { - "canSeeSky": true + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_fungus" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json index 3ba264333f..aed1b717fb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "skrelp", + "id": "skrelp-1", "pokemon": "skrelp", "presets": [ "underwater" @@ -18,6 +18,9 @@ "canSeeSky": true, "biomes": [ "#minecraft:is_ocean" + ], + "neededNearbyBlocks": [ + "minecraft:kelp_plant" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json index 1bc6698f35..5e3290187e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "dragalge", + "id": "dragalge-1", "pokemon": "dragalge", "presets": [ "underwater" @@ -18,6 +18,9 @@ "canSeeSky": true, "biomes": [ "#minecraft:is_ocean" + ], + "neededNearbyBlocks": [ + "minecraft:kelp_plant" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json index bb66afbc3b..f4d9a34f72 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json @@ -34,7 +34,17 @@ "bucket": "common", "level": "6-31", "weight": 5.4, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#minecraft:is_nether" + ] + } }, { "id": "phantump-3", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json index ca46ebeb21..4d7b294b45 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json @@ -34,7 +34,17 @@ "bucket": "common", "level": "26-47", "weight": 0.6, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#minecraft:is_nether" + ] + } }, { "id": "trevenant-3", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index b17b51ac9c..47b44c8294 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json @@ -37,6 +37,22 @@ "#cobblemon:is_frozen" ] } + }, + { + "id": "bergmite-3", + "pokemon": "bergmite", + "presets": [ + "natural" + ], + "type": "pokemon", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json index 5496d7281c..61fdd84489 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json @@ -37,6 +37,22 @@ "#cobblemon:is_frozen" ] } + }, + { + "id": "avalugg-3", + "pokemon": "avalugg", + "presets": [ + "natural" + ], + "type": "pokemon", + "bucket": "common", + "level": "37-51", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json index 6956978ce6..2b01923eca 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "crabrawler", + "id": "crabrawler-1", "pokemon": "crabrawler", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json index f62be4054d..eb6f9659b3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0749_mudbray.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "mudbray", + "id": "mudbray-1", "pokemon": "mudbray", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json index 70814e8140..e1b47940ae 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0750_mudsdale.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "mudsdale", + "id": "mudsdale-1", "pokemon": "mudsdale", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json index f274bf3fa8..7d63f8f18a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json @@ -40,6 +40,23 @@ "#cobblemon:is_lush" ] } + }, + { + "id": "morelull-3", + "pokemon": "morelull", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 9, + "condition": { + "biomes": [ + "#cobblemon:is_nether_fungus" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json index a26adb4f8b..6f4f0573e3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json @@ -40,6 +40,23 @@ "#cobblemon:is_lush" ] } + }, + { + "id": "shiinotic-3", + "pokemon": "shiinotic", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-41", + "weight": 1, + "condition": { + "biomes": [ + "#cobblemon:is_nether_fungus" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json index 8b8dd9fb5b..626183a0b7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json @@ -34,8 +34,12 @@ "weight": 9.0, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:water" ] }, "anticondition": { @@ -57,6 +61,7 @@ "weight": 9.0, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json index 319b0f7151..8d50440ddc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json @@ -34,8 +34,12 @@ "weight": 1.0, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:water" ] }, "anticondition": { @@ -57,6 +61,7 @@ "weight": 1.0, "condition": { "canSeeSky": false, + "maxY":0, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json index c000be67bd..476fbb2743 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json @@ -34,6 +34,7 @@ "weight": 2.0, "condition": { "canSeeSky": true, + "minY": 48, "biomes": [ "#cobblemon:is_ocean" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json index ec7f8e2313..a1bbdeeece 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json @@ -4,10 +4,11 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "komala", + "id": "komala-1", "pokemon": "komala", "presets": [ "natural", + "foliage", "treetop" ], "type": "pokemon", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json index 75594ac3ea..ed5be00d7a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0821_rookidee.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "rookidee", + "id": "rookidee-1", "pokemon": "rookidee", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json index 827ade10e9..553701a8ab 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0822_corvisquire.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "corvisquire", + "id": "corvisquire-1", "pokemon": "corvisquire", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json index 5fb50fb779..ace993a5da 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0823_corviknight.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "corviknight", + "id": "corviknight-1", "pokemon": "corviknight", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json index f0509e7d1c..35b180834e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "yamper", + "id": "yamper-1", "pokemon": "yamper", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json index e191ba6854..7feca2acf1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "boltund", + "id": "boltund-1", "pokemon": "boltund", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json index dc3f1f95da..cc8484142a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "arrokuda", + "id": "arrokuda-1", "pokemon": "arrokuda", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json index dabe7ed6d2..d9f262c068 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "barraskewda", + "id": "barraskewda-1", "pokemon": "barraskewda", "presets": [ "underwater" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json index 7d04e4294b..6dbcf02b6b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "obstagoon", + "id": "obstagoon-1", "pokemon": "obstagoon", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json index ba2cb1ba4e..132f78384e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "perrserker", + "id": "perrserker-1", "pokemon": "perrserker", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json index 5ed7e86452..f9bd95fb63 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "sirfetchd", + "id": "sirfetchd-1", "pokemon": "sirfetchd", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json index 69edfb5775..b1142c1e18 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "ursaluna", + "id": "ursaluna-1", "pokemon": "ursaluna", "presets": [ "natural" @@ -19,7 +19,8 @@ "#cobblemon:is_forest", "#cobblemon:is_mountain", "#cobblemon:is_taiga" - ] + ], + "minY":48 } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json index 4c81dd27be..3b6b65afc8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json @@ -33,7 +33,16 @@ "bucket": "ultra-rare", "level": "5-31", "weight": 9.0, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_desert" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json index 73bcf3efdd..e160bc6ada 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json @@ -33,7 +33,16 @@ "bucket": "ultra-rare", "level": "16-41", "weight": 0.9, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_desert" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json index 5ceb162c1d..be56d8d6f5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json @@ -32,7 +32,11 @@ "bucket": "ultra-rare", "level": "5-31", "weight": 9.0, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_wasteland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json index 1ee8596638..3b56783000 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json @@ -32,7 +32,11 @@ "bucket": "ultra-rare", "level": "16-41", "weight": 0.9, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_wasteland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json index e9c97ccc30..73d2a13af1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json @@ -32,7 +32,11 @@ "bucket": "ultra-rare", "level": "36-53", "weight": 0.1, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_wasteland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json index 10856e164b..8125d36e04 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json @@ -4,10 +4,11 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "quaxly", + "id": "quaxly-1", "pokemon": "quaxly", "presets": [ - "natural" + "natural", + "river" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json index c66904513c..01d45da3a2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json @@ -4,10 +4,11 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "quaxwell", + "id": "quaxwell-1", "pokemon": "quaxwell", "presets": [ - "natural" + "natural", + "river" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json index 1d1732ff02..6db8cab596 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json @@ -4,10 +4,11 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "quaquaval", + "id": "quaquaval-1", "pokemon": "quaquaval", "presets": [ - "natural" + "natural", + "river" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json index 260668ca54..69f9f7e374 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json @@ -26,6 +26,11 @@ "#cobblemon:is_mushroom", "#cobblemon:is_temperate" ] + }, + "anticondition": { + "biomes": [ + "minecraft:mushroom_fields" + ] } }, { @@ -39,7 +44,18 @@ "bucket": "common", "level": "1-25", "weight": 9.0, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_fungus", + "#cobblemon:is_nether_crimson" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + } }, { "id": "lechonk-3", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json index dc7d5a964c..477b81c606 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json @@ -26,6 +26,11 @@ "#cobblemon:is_mushroom", "#cobblemon:is_temperate" ] + }, + "anticondition": { + "biomes": [ + "minecraft:mushroom_fields" + ] } }, { @@ -39,7 +44,18 @@ "bucket": "common", "level": "18-49", "weight": 1.0, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_fungus", + "#cobblemon:is_nether_crimson" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + } }, { "id": "oinkologne-3", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json index 2a6717790c..5fb809462f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "tandemaus", + "id": "tandemaus-1", "pokemon": "tandemaus", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json index 893c1bc307..667311467d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "maushold", + "id": "maushold-1", "pokemon": "maushold", "presets": [ "woodland_mansion" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json index 049f143c81..be14e5ccec 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "fidough", + "id": "fidough-1", "pokemon": "fidough", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json index 9922dcbc37..20e14b66fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "dachsbun", + "id": "dachsbun-1", "pokemon": "dachsbun", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json index 9ac1a522a1..d0866ad7ff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json @@ -42,6 +42,12 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ] } }, { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json index f639757d24..9ac8ca0a87 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "nacli", + "id": "nacli-1", "pokemon": "nacli", "presets": [ "natural" @@ -20,6 +20,26 @@ "#cobblemon:is_badlands" ] } + }, + { + "id": "nacli-quartz-1", + "pokemon": "nacli", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json index 1b4bb9a0df..494277bc7f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "naclstack", + "id": "naclstack-1", "pokemon": "naclstack", "presets": [ "natural" @@ -20,6 +20,26 @@ "#cobblemon:is_badlands" ] } + }, + { + "id": "naclstack-quartz-1", + "pokemon": "naclstack", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-36", + "weight": 0.9, + "condition": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json index 25d49f7783..63cd8e1712 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "garganacl", + "id": "garganacl-1", "pokemon": "garganacl", "presets": [ "natural" @@ -20,6 +20,26 @@ "#cobblemon:is_badlands" ] } + }, + { + "id": "garganacl-quartz-1", + "pokemon": "garganacl", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-50", + "weight": 0.1, + "condition": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json index f151f9fde1..51674ef2fc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json @@ -14,7 +14,7 @@ "context": "grounded", "bucket": "common", "level": "9-34", - "weight": 10.0, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ @@ -52,7 +52,7 @@ "context": "grounded", "bucket": "common", "level": "9-34", - "weight": 10.0, + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json index 77bde6a5e4..8569a3b397 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json @@ -14,7 +14,7 @@ "context": "grounded", "bucket": "common", "level": "30-51", - "weight": 10.0, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ @@ -52,7 +52,7 @@ "context": "grounded", "bucket": "common", "level": "30-51", - "weight": 10.0, + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json index 23b9a1ec85..2e2d721267 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "shroodle", + "id": "shroodle-1", "pokemon": "shroodle", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json index 08c34e3b17..0bb9a4f207 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "grafaiai", + "id": "grafaiai-1", "pokemon": "grafaiai", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json index 70573c2006..97064d81f7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "flittle", + "id": "flittle-1", "pokemon": "flittle", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json index ec672654e1..1fcab8681e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "espathra", + "id": "espathra-1", "pokemon": "espathra", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json index 4032dcd4bc..73e5b720fe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "tinkatink", + "id": "tinkatink-1", "pokemon": "tinkatink", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json index 1e28b06daf..ed71870bc8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "tinkatuff", + "id": "tinkatuff-1", "pokemon": "tinkatuff", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json index 7493a97244..7ea28a3ffa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "tinkaton", + "id": "tinkaton-1", "pokemon": "tinkaton", "presets": [ "natural" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json index d7671ad8bb..31ac755703 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json @@ -33,6 +33,24 @@ "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" + ], + "neededBaseBlocks": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json index b3154276f3..c552b3d46f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json @@ -33,6 +33,24 @@ "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" + ], + "neededBaseBlocks": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json index 1ca407c6a0..93126e53e2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json @@ -14,7 +14,14 @@ "bucket": "common", "level": "10-35", "weight": 1.8, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } }, { "id": "glimmet-2", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json index b014c5ab89..3c9b4a12d1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json @@ -14,7 +14,14 @@ "bucket": "common", "level": "35-53", "weight": 0.2, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } }, { "id": "glimmora-2", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json index 60b0173820..4f4397f138 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0979_annihilape.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "annihilape", + "id": "annihilape-1", "pokemon": "annihilape", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json index fb20de4981..51bf9567a1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json @@ -17,8 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "minecraft:mangrove_swamp", - "#cobblemon:is_savanna" + "minecraft:mangrove_swamp" ] } }, @@ -36,7 +35,45 @@ "condition": { "canSeeSky": true, "biomes": [ - "minecraft:mangrove_swamp", + "minecraft:mangrove_swamp" + ] + } + }, + { + "id": "clodsire-3", + "pokemon": "clodsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_savanna" + ], + "neededNearbyBlocks": [ + "minecraft:water" + ] + } + }, + { + "id": "clodsire-4", + "pokemon": "clodsire", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ "#cobblemon:is_savanna" ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json index 7eeeac67df..f7d74ead02 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#minecraft:is_forest", + "minecraft:cherry_grove", { "id": "terralith:alpha_islands", "required": false From 97625d275090264e5730e995bc8504277a4fe575 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Fri, 15 Sep 2023 13:50:18 -0400 Subject: [PATCH 10/40] Fixed Bergmite and Avalugg spawns. --- .../resources/data/cobblemon/spawn_pool_world/0712_bergmite.json | 1 + .../resources/data/cobblemon/spawn_pool_world/0713_avalugg.json | 1 + 2 files changed, 2 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index 47b44c8294..25abb2e665 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json @@ -46,6 +46,7 @@ ], "type": "pokemon", "bucket": "common", + "context": "grounded", "level": "5-30", "weight": 9.0, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json index 61fdd84489..c24a2ecc34 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json @@ -45,6 +45,7 @@ "natural" ], "type": "pokemon", + "context": "grounded", "bucket": "common", "level": "37-51", "weight": 1.0, From 3869fc590d1e61211313a96fea5e38034005dd31 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Sat, 16 Sep 2023 20:33:09 -0400 Subject: [PATCH 11/40] Fixed Meowscarada spawning everywhere. --- .../cobblemon/spawn_pool_world/0908_meowscarada.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json index f2fbf994b3..bd54812f01 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json @@ -33,7 +33,16 @@ "bucket": "ultra-rare", "level": "36-53", "weight": 0.1, - "condition": {} + "condition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_desert" + ] + } } ] } \ No newline at end of file From d47197ab3b2dc4d38b8a18a8977eb40024a20117 Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:26:41 -0400 Subject: [PATCH 12/40] Updated spawn files. Added spawn compat for William Wythers' Overhauled Overworld. --- .../cobblemon/spawn_detail_presets/urban.json | 3 - .../spawn_detail_presets/village.json | 7 +++ .../cobblemon/spawn_detail_presets/wild.json | 25 +++++++++ .../spawn_pool_world/0025_pikachu.json | 24 ++++++++ .../spawn_pool_world/0026_raichu.json | 24 ++++++++ .../spawn_pool_world/0029_nidoranf.json | 3 +- .../spawn_pool_world/0030_nidorina.json | 3 +- .../spawn_pool_world/0031_nidoqueen.json | 3 +- .../spawn_pool_world/0032_nidoranm.json | 3 +- .../spawn_pool_world/0033_nidorino.json | 3 +- .../spawn_pool_world/0034_nidoking.json | 3 +- .../spawn_pool_world/0052_meowth.json | 6 +- .../spawn_pool_world/0053_persian.json | 6 +- .../spawn_pool_world/0058_growlithe.json | 3 +- .../spawn_pool_world/0059_arcanine.json | 3 +- .../spawn_pool_world/0074_geodude.json | 3 +- .../spawn_pool_world/0075_graveler.json | 3 +- .../spawn_pool_world/0076_golem.json | 3 +- .../spawn_pool_world/0079_slowpoke.json | 2 +- .../spawn_pool_world/0080_slowbro.json | 2 +- .../spawn_pool_world/0083_farfetchd.json | 33 ++++++++++- .../cobblemon/spawn_pool_world/0086_seel.json | 3 +- .../spawn_pool_world/0087_dewgong.json | 3 +- .../spawn_pool_world/0088_grimer.json | 3 +- .../cobblemon/spawn_pool_world/0089_muk.json | 3 +- .../spawn_pool_world/0096_drowzee.json | 3 +- .../spawn_pool_world/0097_hypno.json | 3 +- .../spawn_pool_world/0100_voltorb.json | 3 +- .../spawn_pool_world/0101_electrode.json | 3 +- .../spawn_pool_world/0102_exeggcute.json | 18 ++++++ .../spawn_pool_world/0103_exeggutor.json | 18 ++++++ .../spawn_pool_world/0104_cubone.json | 6 +- .../spawn_pool_world/0105_marowak.json | 6 +- .../spawn_pool_world/0109_koffing.json | 3 +- .../spawn_pool_world/0110_weezing.json | 3 +- .../spawn_pool_world/0111_rhyhorn.json | 3 +- .../spawn_pool_world/0112_rhydon.json | 3 +- .../spawn_pool_world/0113_chansey.json | 3 +- .../spawn_pool_world/0114_tangela.json | 3 +- .../spawn_pool_world/0115_kangaskhan.json | 3 +- .../spawn_pool_world/0122_mrmime.json | 3 +- .../spawn_pool_world/0123_scyther.json | 6 +- .../cobblemon/spawn_pool_world/0124_jynx.json | 3 +- .../spawn_pool_world/0127_pinsir.json | 3 +- .../spawn_pool_world/0132_ditto.json | 10 ++++ .../spawn_pool_world/0133_eevee.json | 6 +- .../spawn_pool_world/0134_vaporeon.json | 5 +- .../spawn_pool_world/0135_jolteon.json | 3 +- .../spawn_pool_world/0136_flareon.json | 3 +- .../spawn_pool_world/0194_wooper.json | 2 + .../spawn_pool_world/0195_quagsire.json | 2 + .../spawn_pool_world/0196_espeon.json | 3 +- .../spawn_pool_world/0197_umbreon.json | 3 +- .../spawn_pool_world/0199_slowking.json | 2 +- .../spawn_pool_world/0209_snubbull.json | 3 +- .../spawn_pool_world/0210_granbull.json | 3 +- .../spawn_pool_world/0212_scizor.json | 3 +- .../spawn_pool_world/0215_sneasel.json | 3 +- .../spawn_pool_world/0216_teddiursa.json | 3 +- .../spawn_pool_world/0217_ursaring.json | 3 +- .../spawn_pool_world/0220_swinub.json | 3 +- .../spawn_pool_world/0221_piloswine.json | 3 +- .../spawn_pool_world/0231_phanpy.json | 6 +- .../spawn_pool_world/0232_donphan.json | 6 +- .../spawn_pool_world/0234_stantler.json | 3 +- .../spawn_pool_world/0238_smoochum.json | 3 +- .../spawn_pool_world/0242_blissey.json | 3 +- .../spawn_pool_world/0263_zigzagoon.json | 3 +- .../spawn_pool_world/0264_linoone.json | 3 +- .../spawn_pool_world/0278_wingull.json | 5 ++ .../spawn_pool_world/0279_pelipper.json | 5 ++ .../spawn_pool_world/0280_ralts.json | 3 +- .../spawn_pool_world/0281_kirlia.json | 3 +- .../spawn_pool_world/0282_gardevoir.json | 3 +- .../spawn_pool_world/0327_spinda.json | 15 +++-- .../spawn_pool_world/0403_shinx.json | 3 +- .../spawn_pool_world/0404_luxio.json | 3 +- .../spawn_pool_world/0405_luxray.json | 3 +- .../spawn_pool_world/0427_buneary.json | 3 +- .../spawn_pool_world/0428_lopunny.json | 3 +- .../spawn_pool_world/0439_mimejr.json | 3 +- .../spawn_pool_world/0440_happiny.json | 3 +- .../spawn_pool_world/0443_gible.json | 3 +- .../spawn_pool_world/0444_gabite.json | 3 +- .../spawn_pool_world/0445_garchomp.json | 3 +- .../spawn_pool_world/0447_riolu.json | 3 +- .../spawn_pool_world/0448_lucario.json | 3 +- .../spawn_pool_world/0461_weavile.json | 4 ++ .../spawn_pool_world/0464_rhyperior.json | 3 +- .../spawn_pool_world/0465_tangrowth.json | 3 +- .../spawn_pool_world/0470_leafeon.json | 3 +- .../spawn_pool_world/0471_glaceon.json | 3 +- .../spawn_pool_world/0473_mamoswine.json | 3 +- .../spawn_pool_world/0475_gallade.json | 3 +- .../spawn_pool_world/0506_lillipup.json | 3 +- .../spawn_pool_world/0507_herdier.json | 3 +- .../spawn_pool_world/0508_stoutland.json | 3 +- .../spawn_pool_world/0519_pidove.json | 3 +- .../spawn_pool_world/0520_tranquill.json | 3 +- .../spawn_pool_world/0521_unfezant.json | 3 +- .../spawn_pool_world/0532_timburr.json | 3 +- .../spawn_pool_world/0533_gurdurr.json | 3 +- .../spawn_pool_world/0534_conkeldurr.json | 3 +- .../spawn_pool_world/0543_venipede.json | 9 ++- .../spawn_pool_world/0544_whirlipede.json | 9 ++- .../spawn_pool_world/0545_scolipede.json | 9 ++- .../spawn_pool_world/0585_deerling.json | 3 +- .../spawn_pool_world/0586_sawsbuck.json | 3 +- .../spawn_pool_world/0626_bouffalant.json | 3 +- .../spawn_pool_world/0631_heatmor.json | 8 ++- .../spawn_pool_world/0690_skrelp.json | 2 +- .../spawn_pool_world/0691_dragalge.json | 2 +- .../spawn_pool_world/0700_sylveon.json | 3 +- .../spawn_pool_world/0708_phantump.json | 9 ++- .../spawn_pool_world/0709_trevenant.json | 9 ++- .../spawn_pool_world/0767_wimpod.json | 3 +- .../spawn_pool_world/0768_golisopod.json | 3 +- .../spawn_pool_world/0771_pyukumuku.json | 2 +- .../spawn_pool_world/0775_komala.json | 3 +- .../spawn_pool_world/0835_yamper.json | 3 +- .../spawn_pool_world/0836_boltund.json | 3 +- .../spawn_pool_world/0850_sizzlipede.json | 12 ++-- .../spawn_pool_world/0851_centiskorch.json | 12 ++-- .../spawn_pool_world/0862_obstagoon.json | 3 +- .../spawn_pool_world/0863_perrserker.json | 3 +- .../spawn_pool_world/0865_sirfetchd.json | 8 ++- .../spawn_pool_world/0899_wyrdeer.json | 3 +- .../spawn_pool_world/0900_kleavor.json | 3 +- .../spawn_pool_world/0901_ursaluna.json | 3 +- .../spawn_pool_world/0926_fidough.json | 3 +- .../spawn_pool_world/0927_dachsbun.json | 3 +- .../spawn_pool_world/0931_squawkabilly.json | 3 +- .../spawn_pool_world/0932_nacli.json | 24 +++++++- .../spawn_pool_world/0933_naclstack.json | 24 +++++++- .../spawn_pool_world/0934_garganacl.json | 24 +++++++- .../spawn_pool_world/0942_maschiff.json | 3 +- .../spawn_pool_world/0943_mabosstiff.json | 3 +- .../spawn_pool_world/0944_shroodle.json | 4 +- .../spawn_pool_world/0945_grafaiai.json | 3 +- .../spawn_pool_world/0955_flittle.json | 3 +- .../spawn_pool_world/0956_espathra.json | 3 +- .../spawn_pool_world/0957_tinkatink.json | 3 +- .../spawn_pool_world/0958_tinkatuff.json | 3 +- .../spawn_pool_world/0959_tinkaton.json | 3 +- .../spawn_pool_world/0974_cetoddle.json | 6 +- .../spawn_pool_world/0975_cetitan.json | 6 +- .../spawn_pool_world/0978_tatsugiri.json | 3 +- .../tags/worldgen/biome/is_abyss.json | 8 +++ .../tags/worldgen/biome/is_autumn.json | 32 +++++++++++ .../tags/worldgen/biome/is_badlands.json | 4 ++ .../tags/worldgen/biome/is_bamboo.json | 34 ++++++++++- .../tags/worldgen/biome/is_beach.json | 15 +++++ .../tags/worldgen/biome/is_cave.json | 56 +++++++++++++++++++ .../tags/worldgen/biome/is_coast.json | 52 +++++++++++++++++ .../tags/worldgen/biome/is_cold.json | 16 ++++++ .../tags/worldgen/biome/is_deep.json | 6 +- .../tags/worldgen/biome/is_desert.json | 28 ++++++++++ .../tags/worldgen/biome/is_dripstone.json | 20 +++++++ .../tags/worldgen/biome/is_floral.json | 28 ++++++++++ .../tags/worldgen/biome/is_forest.json | 28 ++++++++++ .../tags/worldgen/biome/is_freezing.json | 24 ++++++++ .../tags/worldgen/biome/is_frigid.json | 10 +++- .../tags/worldgen/biome/is_frozen.json | 10 +++- .../tags/worldgen/biome/is_glacial.json | 16 ++++++ .../tags/worldgen/biome/is_highlands.json | 32 +++++++++++ .../tags/worldgen/biome/is_hills.json | 31 ++++++++++ .../tags/worldgen/biome/is_island.json | 40 +++++++++++++ .../tags/worldgen/biome/is_jungle.json | 56 +++++++++++++++++++ .../tags/worldgen/biome/is_lukewarm.json | 14 ++++- .../tags/worldgen/biome/is_lush.json | 28 ++++++++++ .../tags/worldgen/biome/is_magical.json | 16 ++++++ .../tags/worldgen/biome/is_mountain.json | 20 +++++++ .../tags/worldgen/biome/is_mushroom.json | 28 ++++++++++ .../tags/worldgen/biome/is_peak.json | 20 +++++++ .../tags/worldgen/biome/is_plains.json | 56 +++++++++++++++++++ .../tags/worldgen/biome/is_plateau.json | 4 ++ .../tags/worldgen/biome/is_river.json | 8 +++ .../tags/worldgen/biome/is_salt.json | 33 +++++++++++ .../tags/worldgen/biome/is_savanna.json | 12 ++++ .../tags/worldgen/biome/is_snowy.json | 20 +++++++ .../tags/worldgen/biome/is_spooky.json | 20 +++++++ .../tags/worldgen/biome/is_spring.json | 8 +++ .../tags/worldgen/biome/is_swamp.json | 18 +++++- .../tags/worldgen/biome/is_taiga.json | 8 +++ .../tags/worldgen/biome/is_thermal.json | 28 ++++++++++ .../tags/worldgen/biome/is_tropical.json | 17 ++++++ .../tags/worldgen/biome/is_tundra.json | 24 ++++++++ .../tags/worldgen/biome/is_volcanic.json | 20 +++++++ .../tags/worldgen/biome/is_winter.json | 4 ++ 189 files changed, 1512 insertions(+), 179 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/village.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_detail_presets/wild.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_beach.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_salt.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tropical.json diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json index 699a0e8119..d1820ee216 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json @@ -1,8 +1,5 @@ { "condition": { - "structures": [ - "#minecraft:village" - ], "neededNearbyBlocks": [ "minecraft:white_concrete", "minecraft:orange_concrete", diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/village.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/village.json new file mode 100644 index 0000000000..9ce44e79ab --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/village.json @@ -0,0 +1,7 @@ +{ + "condition": { + "structures": [ + "#minecraft:village" + ] + } +} diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/wild.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/wild.json new file mode 100644 index 0000000000..c832208906 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/wild.json @@ -0,0 +1,25 @@ +{ + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "neededNearbyBlocks": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" + ] + } +} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json index 6c6e2da5ad..a3f9ada520 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json @@ -31,6 +31,30 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "pikachu-alolan-1", + "pokemon": "pikachu alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-32", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_beach" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json index 90e621b6c3..a025d72f29 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json @@ -31,6 +31,30 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "raichu-alolan-1", + "pokemon": "raichu alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "27-49", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_beach" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json index 2d11badc74..b0cc5c188e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0029_nidoranf.json @@ -7,7 +7,8 @@ "id": "nidoranf-1", "pokemon": "nidoranf", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json index 44c65f083e..3b6f5604bb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0030_nidorina.json @@ -7,7 +7,8 @@ "id": "nidorina-1", "pokemon": "nidorina", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json index 7c19646957..fde2326b6c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0031_nidoqueen.json @@ -7,7 +7,8 @@ "id": "nidoqueen-1", "pokemon": "nidoqueen", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json index f077d8e08f..ebebb1d556 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0032_nidoranm.json @@ -7,7 +7,8 @@ "id": "nidoranm-1", "pokemon": "nidoranm", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json index 6fb2feea48..4140ae975e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0033_nidorino.json @@ -7,7 +7,8 @@ "id": "nidorino-1", "pokemon": "nidorino", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json index 59141c1a6c..e800aa1db9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0034_nidoking.json @@ -7,7 +7,8 @@ "id": "nidoking-1", "pokemon": "nidoking", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json index b0fbf93f41..d890d4ea25 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json @@ -8,7 +8,8 @@ "pokemon": "meowth", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", @@ -41,7 +42,8 @@ "pokemon": "meowth", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json index bb155f5e97..02899ef5d8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json @@ -8,7 +8,8 @@ "pokemon": "persian", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", @@ -41,7 +42,8 @@ "pokemon": "persian", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json index a1fcd44bca..07ef89e96c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json @@ -8,7 +8,8 @@ "pokemon": "growlithe", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json index de023f8f00..cc94fce125 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json @@ -8,7 +8,8 @@ "pokemon": "arcanine", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json index 07f29c37d4..e1e242e7e4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json @@ -7,7 +7,8 @@ "id": "geodude-1", "pokemon": "geodude", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json index dce2428881..bc0f329992 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json @@ -7,7 +7,8 @@ "id": "graveler-1", "pokemon": "graveler", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json index 3e6920e62a..aee129681c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json @@ -7,7 +7,8 @@ "id": "golem-1", "pokemon": "golem", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json index 2b69e4450f..467606ce44 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_beach" + "#cobblemon:is_beach" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json index d34906500b..f633b6ec7f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_beach" + "#cobblemon:is_beach" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json index 4f2089e22b..ab000bec59 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json @@ -8,7 +8,8 @@ "pokemon": "farfetchd", "presets": [ "natural", - "treetop" + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", @@ -35,6 +36,36 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "farfetchd-galarian-1", + "pokemon": "farfetchd galarian", + "presets": [ + "natural" + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "13-38", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ] + }, + "anticondition": { + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json index 3311606c6a..456f14e9f7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json @@ -7,7 +7,8 @@ "id": "seel-1", "pokemon": "seel", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json index 7131744168..1f650a511b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json @@ -7,7 +7,8 @@ "id": "dewgong-1", "pokemon": "dewgong", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json index d2693f2c0e..55b78fce58 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json @@ -32,7 +32,8 @@ "pokemon": "grimer", "presets": [ "water_surface", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "surface", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json index eef13bd3f0..ab3a11588e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json @@ -32,7 +32,8 @@ "pokemon": "muk", "presets": [ "water_surface", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "surface", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json index ef67dd9d5b..9c8ab0ac85 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json @@ -8,7 +8,8 @@ "pokemon": "drowzee", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json index 13ad784c74..e946c28015 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json @@ -8,7 +8,8 @@ "pokemon": "hypno", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json index 2539ae3d48..0da8c2e90a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json @@ -8,7 +8,8 @@ "pokemon": "voltorb", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json index d9dff441c7..75fe81971a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json @@ -8,7 +8,8 @@ "pokemon": "electrode", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json index 363c5e29fc..0a3b84f058 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0102_exeggcute.json @@ -20,6 +20,24 @@ "#cobblemon:is_jungle" ] } + }, + { + "id": "exeggcute-alolan-1", + "pokemon": "exeggcute alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_beach" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json index 9ef27c912e..e123e29991 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0103_exeggutor.json @@ -20,6 +20,24 @@ "#cobblemon:is_jungle" ] } + }, + { + "id": "exeggutor-alolan-1", + "pokemon": "exeggutor alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_beach" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json index 260a866506..008c62ead4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json @@ -7,7 +7,8 @@ "id": "cubone-1", "pokemon": "cubone", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -25,7 +26,8 @@ "id": "cubone-alolan-1", "pokemon": "cubone", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json index 15d5b4c88c..3445659a1a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json @@ -7,7 +7,8 @@ "id": "marowak-1", "pokemon": "marowak", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -25,7 +26,8 @@ "id": "marowak-alolan-1", "pokemon": "marowak", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json index 3b66d48fe2..f34403ed60 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json @@ -8,7 +8,8 @@ "pokemon": "koffing", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json index 69d7f84269..2af139866e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json @@ -8,7 +8,8 @@ "pokemon": "weezing", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json index 6ec11dbafd..3a4f3815d9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0111_rhyhorn.json @@ -7,7 +7,8 @@ "id": "rhyhorn-1", "pokemon": "rhyhorn", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json index a2a6d84890..975fb26be7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0112_rhydon.json @@ -7,7 +7,8 @@ "id": "rhydon-1", "pokemon": "rhydon", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json index f86654846e..051c4fb693 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json @@ -8,7 +8,8 @@ "pokemon": "chansey", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json index c75f8d813e..349d67e737 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0114_tangela.json @@ -7,7 +7,8 @@ "id": "tangela-1", "pokemon": "tangela", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json index f08c3f074a..b08460b24e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0115_kangaskhan.json @@ -7,7 +7,8 @@ "id": "kangaskhan-1", "pokemon": "kangaskhan", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json index 88cba4fb74..7c8cf29592 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json @@ -8,7 +8,8 @@ "pokemon": "mrmime", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json index b8e2ab9c85..3fe12f45bf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json @@ -7,7 +7,8 @@ "id": "scyther-1", "pokemon": "scyther", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -32,7 +33,8 @@ "id": "scyther-2", "pokemon": "scyther", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json index 297865518c..7763c7d3bb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json @@ -8,7 +8,8 @@ "pokemon": "jynx", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json index 542c5d885e..96e73f9eb1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json @@ -8,7 +8,8 @@ "pokemon": "pinsir", "presets": [ "natural", - "treetop" + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", 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 255815a496..9caafe76df 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 @@ -19,6 +19,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_ocean" + ] } }, { @@ -37,6 +42,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_ocean" + ] } }, { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json index ccceb28213..b84ebbab93 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json @@ -22,7 +22,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_temperate" + "#cobblemon:is_ocean", + "#cobblemon:is_temperate" ] } }, @@ -49,7 +50,8 @@ "pokemon": "eevee", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json index 94fcbc934c..fdf14d24fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json @@ -40,11 +40,12 @@ "pokemon": "vaporeon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", - "bucket": "ultra-rare", + "bucket": "uncommon", "level": "28-53", "weight": 0.025, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json index 54e2cf7134..17eb4e54de 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json @@ -26,7 +26,8 @@ "pokemon": "jolteon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json index ec70c237cb..a18f060193 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json @@ -26,7 +26,8 @@ "pokemon": "flareon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json index 3d99a500bc..60dd582644 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -52,6 +52,7 @@ "weight": 9.0, "condition": { "canSeeSky": false, + "maxY": 62, "biomes": [ "#cobblemon:is_overworld" ] @@ -75,6 +76,7 @@ "weight": 9.0, "condition": { "canSeeSky": false, + "maxY": 62, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json index 2713c5bfa4..de55670a28 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json @@ -52,6 +52,7 @@ "weight": 1.0, "condition": { "canSeeSky": false, + "maxY": 62, "biomes": [ "#cobblemon:is_overworld" ] @@ -75,6 +76,7 @@ "weight": 1.0, "condition": { "canSeeSky": false, + "maxY": 62, "biomes": [ "#cobblemon:is_overworld" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json index 8fc19a6e8d..d265bfdb93 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json @@ -26,7 +26,8 @@ "pokemon": "espeon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json index 704f9a10ad..1ff61e6102 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json @@ -26,7 +26,8 @@ "pokemon": "umbreon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json index 8864c51922..4bd23ef88e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_beach" + "#cobblemon:is_beach" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json index e9bbf9b41d..18cc5f72f6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json @@ -8,7 +8,8 @@ "pokemon": "snubbull", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json index e44372c347..f7ed999573 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json @@ -8,7 +8,8 @@ "pokemon": "granbull", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json index b597b53ffc..8043c443df 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json @@ -7,7 +7,8 @@ "id": "scizor-1", "pokemon": "scizor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json index 6229a3cfe7..ffbf88e923 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json @@ -7,7 +7,8 @@ "id": "sneasel-1", "pokemon": "sneasel", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json index d6d3904918..b8e52c2cec 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json @@ -7,7 +7,8 @@ "id": "teddiursa-1", "pokemon": "teddiursa", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json index 30df33ebe0..71adbe4d5f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json @@ -7,7 +7,8 @@ "id": "ursaring-1", "pokemon": "ursaring", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json index a7b8d7d351..9102b304d1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json @@ -7,7 +7,8 @@ "id": "swinub-1", "pokemon": "swinub", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0221_piloswine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0221_piloswine.json index f98d7d71b0..ccb368ca0c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0221_piloswine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0221_piloswine.json @@ -7,7 +7,8 @@ "id": "piloswine-1", "pokemon": "piloswine", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json index cbdfe313bb..252db4e9df 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json @@ -7,7 +7,8 @@ "id": "phanpy-1", "pokemon": "phanpy", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -31,7 +32,8 @@ "id": "phanpy-2", "pokemon": "phanpy", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json index 17508a7f16..3a4be66b9d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json @@ -7,7 +7,8 @@ "id": "donphan-1", "pokemon": "donphan", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -31,7 +32,8 @@ "id": "donphan-2", "pokemon": "donphan", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json index 74b87609f1..4434cb4a76 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json @@ -7,7 +7,8 @@ "id": "stantler-1", "pokemon": "stantler", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json index 0df5408656..e6825022d3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0238_smoochum.json @@ -8,7 +8,8 @@ "pokemon": "smoochum", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json index b67cb60d42..10d0e75feb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json @@ -8,7 +8,8 @@ "pokemon": "blissey", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json index 0ec7847877..a4885898fe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json @@ -31,7 +31,8 @@ "id": "zigzagoon-galarian-1", "pokemon": "zigzagoon galarian", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json index c9afa60348..9dc9eab040 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json @@ -31,7 +31,8 @@ "id": "linoone-galarian-1", "pokemon": "linoone galarian", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json index 8bfb63b1c6..e1f4f5748e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json @@ -23,6 +23,11 @@ "#cobblemon:is_sky" ], "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json index a19fcace42..dbfac2ee29 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json @@ -23,6 +23,11 @@ "#cobblemon:is_sky" ], "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json index a90adcc88f..230c94d4a0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json @@ -28,7 +28,8 @@ "pokemon": "ralts", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json index a49e69c252..f467be7db1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json @@ -28,7 +28,8 @@ "pokemon": "kirlia", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json index bf40863d9a..0044a97043 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json @@ -28,7 +28,8 @@ "pokemon": "gardevoir", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json index caf26da494..fbf58e6e87 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json @@ -7,7 +7,8 @@ "id": "spinda-1", "pokemon": "spinda", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -26,7 +27,8 @@ "id": "spinda-2", "pokemon": "spinda special_spots=1 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -45,7 +47,8 @@ "id": "spinda-3", "pokemon": "spinda special_spots=2 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -64,7 +67,8 @@ "id": "spinda-4", "pokemon": "spinda special_spots=3 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -83,7 +87,8 @@ "id": "spinda-5", "pokemon": "spinda special_spots=4 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json index b0c6621ad5..92c2151d44 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json @@ -7,7 +7,8 @@ "id": "shinx-1", "pokemon": "shinx", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json index 19aa30a776..806c8a807b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json @@ -7,7 +7,8 @@ "id": "luxio-1", "pokemon": "luxio", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json index e8e5e23a57..e06883ed02 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json @@ -7,7 +7,8 @@ "id": "luxray-1", "pokemon": "luxray", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json index d24f715075..8efa65441a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0427_buneary.json @@ -7,7 +7,8 @@ "id": "buneary-1", "pokemon": "buneary", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json index dcb24b638c..4b2f271e93 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0428_lopunny.json @@ -7,7 +7,8 @@ "id": "lopunny-1", "pokemon": "lopunny", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json index 71e6d57bb2..93b1a22f3d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json @@ -8,7 +8,8 @@ "pokemon": "mimejr", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json index 0d9a588dc9..fd984951fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json @@ -8,7 +8,8 @@ "pokemon": "happiny", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json index 4a07809484..f8a934f17d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json @@ -7,7 +7,8 @@ "id": "gible-1", "pokemon": "gible", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json index f7bc53819d..e3f934fb31 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json @@ -7,7 +7,8 @@ "id": "gabite-1", "pokemon": "gabite", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json index c7d1e59324..fbf8583326 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json @@ -7,7 +7,8 @@ "id": "garchomp-1", "pokemon": "garchomp", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json index 34bddfe092..8a5546e6dd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json @@ -7,7 +7,8 @@ "id": "riolu-1", "pokemon": "riolu", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json index f260171619..363ea3966a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json @@ -7,7 +7,8 @@ "id": "lucario-1", "pokemon": "lucario", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json index a6f75be24c..35b5421a7a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0461_weavile.json @@ -6,6 +6,10 @@ { "id": "weavile-1", "pokemon": "weavile", + "presets": [ + "natural", + "wild" + ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json index 2af0944454..d9d91919d0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0464_rhyperior.json @@ -7,7 +7,8 @@ "id": "rhyperior-1", "pokemon": "rhyperior", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json index fabee65011..e21b3545b9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0465_tangrowth.json @@ -7,7 +7,8 @@ "id": "tangrowth-1", "pokemon": "tangrowth", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json index 3ddc4b7a0c..4b2d0c73c9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json @@ -33,7 +33,8 @@ "pokemon": "leafeon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json index 910fc42b0e..1935e09d1e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json @@ -26,7 +26,8 @@ "pokemon": "glaceon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json index 76cb860b25..88914c79e2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0473_mamoswine.json @@ -7,7 +7,8 @@ "id": "mamoswine-1", "pokemon": "mamoswine", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json index 5790ffb4cb..1ff2ea95fb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json @@ -28,7 +28,8 @@ "pokemon": "gallade", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json index 623f7f0bbc..50008affcd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json @@ -8,7 +8,8 @@ "pokemon": "lillipup", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json index 66b7aee9d7..519a52ac8c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json @@ -8,7 +8,8 @@ "pokemon": "herdier", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json index 1c6d904691..7c309a0f8e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json @@ -8,7 +8,8 @@ "pokemon": "stoutland", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json index d1b2b85bb2..bbd3bc786d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json @@ -28,7 +28,8 @@ "id": "pidove-2", "pokemon": "pidove", "presets": [ - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json index 8d03e8ad23..0e0176b9e1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json @@ -28,7 +28,8 @@ "id": "tranquill-2", "pokemon": "tranquill", "presets": [ - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json index a6cee273d6..bbde9f3ee2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json @@ -28,7 +28,8 @@ "id": "unfezant-2", "pokemon": "unfezant", "presets": [ - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json index 31f4e570a4..91369561cf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json @@ -8,7 +8,8 @@ "pokemon": "timburr", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json index 0a561bba66..88ddb40105 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json @@ -8,7 +8,8 @@ "pokemon": "gurdurr", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json index aafa997165..f413a90b52 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json @@ -8,7 +8,8 @@ "pokemon": "conkeldurr", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json index 257eb2b05e..31e36e5abd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json @@ -7,7 +7,8 @@ "id": "venipede-1", "pokemon": "venipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -26,7 +27,8 @@ "id": "venipede-2", "pokemon": "venipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -63,7 +65,8 @@ "id": "venipede-4", "pokemon": "venipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json index 448f0fa2c0..7e2cdedf55 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json @@ -7,7 +7,8 @@ "id": "whirlipede-1", "pokemon": "whirlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -26,7 +27,8 @@ "id": "whirlipede-2", "pokemon": "whirlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -63,7 +65,8 @@ "id": "whirlipede-4", "pokemon": "whirlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json index 3519809798..f429564317 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json @@ -7,7 +7,8 @@ "id": "scolipede-1", "pokemon": "scolipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -26,7 +27,8 @@ "id": "scolipede-2", "pokemon": "scolipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -63,7 +65,8 @@ "id": "scolipede-4", "pokemon": "scolipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json index 2e8461ddcc..1ce3b42ca3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json @@ -7,7 +7,8 @@ "id": "deerling-1", "pokemon": "deerling", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json index 44d85e6a77..40d5f706a1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json @@ -7,7 +7,8 @@ "id": "sawsbuck-1", "pokemon": "sawsbuck", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json index 74a8a7d2f2..95152c94c4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json @@ -7,7 +7,8 @@ "id": "bouffalant-1", "pokemon": "bouffalant", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json index 7d3d4e21ab..1eb187fc4b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json @@ -7,13 +7,14 @@ "id": "heatmor-1", "pokemon": "heatmor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", "level": "23-48", - "weight": 10.0, + "weight": 6.0, "weightMultiplier": { "multiplier": 0.25, "condition": { @@ -32,7 +33,8 @@ "id": "heatmor-2", "pokemon": "heatmor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json index aed1b717fb..03df9426b3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json @@ -11,7 +11,7 @@ ], "type": "pokemon", "context": "submerged", - "bucket": "common", + "bucket": "uncommon", "level": "7-32", "weight": 9.0, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json index 5e3290187e..a186d2a998 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json @@ -11,7 +11,7 @@ ], "type": "pokemon", "context": "submerged", - "bucket": "common", + "bucket": "uncommon", "level": "48-49", "weight": 1.0, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json index c951407685..bba52a9ea6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json @@ -32,7 +32,8 @@ "pokemon": "sylveon", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json index f4d9a34f72..0b451ce310 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json @@ -7,7 +7,8 @@ "id": "phantump-1", "pokemon": "phantump", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -27,7 +28,8 @@ "id": "phantump-2", "pokemon": "phantump", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -50,7 +52,8 @@ "id": "phantump-3", "pokemon": "phantump", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json index 4d7b294b45..a230df2069 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json @@ -7,7 +7,8 @@ "id": "trevenant-1", "pokemon": "trevenant", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -27,7 +28,8 @@ "id": "trevenant-2", "pokemon": "trevenant", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -50,7 +52,8 @@ "id": "trevenant-3", "pokemon": "trevenant", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json index 626183a0b7..c4838fe926 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json @@ -7,7 +7,8 @@ "id": "wimpod-1", "pokemon": "wimpod", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json index 8d50440ddc..afad6c2b0e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json @@ -7,7 +7,8 @@ "id": "golisopod-1", "pokemon": "golisopod", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json index 476fbb2743..9cea171181 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_beach" + "#cobblemon:is_beach" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json index a1bbdeeece..57837c29aa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json @@ -9,7 +9,8 @@ "presets": [ "natural", "foliage", - "treetop" + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json index 35b180834e..811d276421 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json @@ -8,7 +8,8 @@ "pokemon": "yamper", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json index 7feca2acf1..e386831918 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json @@ -8,7 +8,8 @@ "pokemon": "boltund", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json index 931623804e..c08c04a266 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json @@ -7,7 +7,8 @@ "id": "sizzlipede-1", "pokemon": "sizzlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -17,7 +18,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_badlands" + "#cobblemon:is_badlands", + "#cobblemon:is_volcanic" ] } }, @@ -25,7 +27,8 @@ "id": "sizzlipede-2", "pokemon": "sizzlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -42,7 +45,8 @@ "id": "sizzlipede-3", "pokemon": "sizzlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json index d1abd5bee4..eb82fba4e0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0851_centiskorch.json @@ -7,7 +7,8 @@ "id": "centiskorch-1", "pokemon": "centiskorch", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -17,7 +18,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_badlands" + "#cobblemon:is_badlands", + "#cobblemon:is_volcanic" ] } }, @@ -25,7 +27,8 @@ "id": "centiskorch-2", "pokemon": "centiskorch", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -42,7 +45,8 @@ "id": "centiskorch-3", "pokemon": "centiskorch", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json index 6dbcf02b6b..0cd8724592 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json @@ -7,7 +7,8 @@ "id": "obstagoon-1", "pokemon": "obstagoon", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json index 132f78384e..38b34d2911 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json @@ -8,7 +8,8 @@ "pokemon": "perrserker", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json index f9bd95fb63..f644372e95 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json @@ -7,7 +7,8 @@ "id": "sirfetchd-1", "pokemon": "sirfetchd", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -25,6 +26,11 @@ "biomes": [ "#cobblemon:is_forest" ] + }, + "anticondition": { + "neededNearbyBlocks": [ + "#minecraft:water" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json index 7673f680ed..ff73415f7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0899_wyrdeer.json @@ -7,7 +7,8 @@ "id": "wyrdeer-1", "pokemon": "wyrdeer", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json index a32a76b27d..363f22d6a4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json @@ -7,7 +7,8 @@ "id": "kleavor-1", "pokemon": "kleavor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json index b1142c1e18..9a9b5c1f4a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json @@ -7,7 +7,8 @@ "id": "ursaluna-1", "pokemon": "ursaluna", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json index be14e5ccec..18a5033b52 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json @@ -8,7 +8,8 @@ "pokemon": "fidough", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json index 20e14b66fd..7caaf2eecd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json @@ -8,7 +8,8 @@ "pokemon": "dachsbun", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json index d0866ad7ff..9f0bb3235b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json @@ -28,7 +28,8 @@ "id": "squawkabilly-2", "pokemon": "squawkabilly", "presets": [ - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json index 9ac8ca0a87..29e8418f33 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json @@ -7,7 +7,8 @@ "id": "nacli-1", "pokemon": "nacli", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -20,12 +21,31 @@ "#cobblemon:is_badlands" ] } + }, + { + "id": "nacli-2", + "pokemon": "nacli", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_salt" + ] + } }, { "id": "nacli-quartz-1", "pokemon": "nacli", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json index 494277bc7f..ec8f44d054 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json @@ -7,7 +7,8 @@ "id": "naclstack-1", "pokemon": "naclstack", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -20,12 +21,31 @@ "#cobblemon:is_badlands" ] } + }, + { + "id": "naclstack-2", + "pokemon": "naclstack", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-36", + "weight": 0.9, + "condition": { + "biomes": [ + "#cobblemon:is_salt" + ] + } }, { "id": "naclstack-quartz-1", "pokemon": "naclstack", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json index 63cd8e1712..cffe9a805c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json @@ -7,7 +7,8 @@ "id": "garganacl-1", "pokemon": "garganacl", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -20,12 +21,31 @@ "#cobblemon:is_badlands" ] } + }, + { + "id": "garganacl-2", + "pokemon": "garganacl", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-50", + "weight": 0.1, + "condition": { + "biomes": [ + "#cobblemon:is_salt" + ] + } }, { "id": "garganacl-quartz-1", "pokemon": "garganacl", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json index 51674ef2fc..a6eec7cb57 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json @@ -27,7 +27,8 @@ "pokemon": "maschiff", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json index 8569a3b397..b505fa1ce2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json @@ -27,7 +27,8 @@ "pokemon": "mabosstiff", "presets": [ "natural", - "urban" + "urban", + "village" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json index 2e2d721267..e6a594ad81 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json @@ -7,7 +7,9 @@ "id": "shroodle-1", "pokemon": "shroodle", "presets": [ - "natural" + "natural", + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json index 0bb9a4f207..002b4e8c0a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json @@ -8,7 +8,8 @@ "pokemon": "grafaiai", "presets": [ "natural", - "treetop" + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json index 97064d81f7..cb1aeac749 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json @@ -7,7 +7,8 @@ "id": "flittle-1", "pokemon": "flittle", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json index 1fcab8681e..057f77814c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json @@ -7,7 +7,8 @@ "id": "espathra-1", "pokemon": "espathra", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json index 73e5b720fe..45ae9fe4d3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json @@ -7,7 +7,8 @@ "id": "tinkatink-1", "pokemon": "tinkatink", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json index ed71870bc8..28c742259b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json @@ -7,7 +7,8 @@ "id": "tinkatuff-1", "pokemon": "tinkatuff", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json index 7ea28a3ffa..061d3b2b08 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json @@ -7,7 +7,8 @@ "id": "tinkaton-1", "pokemon": "tinkaton", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json index 7db543c5d8..7662dcc013 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json @@ -7,7 +7,8 @@ "id": "cetoddle-1", "pokemon": "cetoddle", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -25,7 +26,8 @@ "id": "cetoddle-2", "pokemon": "cetoddle", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json index 84a8450b9b..7b935bca97 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json @@ -7,7 +7,8 @@ "id": "cetitan-1", "pokemon": "cetitan", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", @@ -25,7 +26,8 @@ "id": "cetitan-2", "pokemon": "cetitan", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json index d8ec06dd86..f678dc71e3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json @@ -7,7 +7,8 @@ "id": "tatsugiri-1", "pokemon": "tatsugiri", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_abyss.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_abyss.json index e6a4890888..8aecfaf0b1 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_abyss.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_abyss.json @@ -21,6 +21,14 @@ { "id": "terralith:cave/tuff_caves", "required": false + }, + { + "id": "wythers:deep_dark_forest", + "required": false + }, + { + "id": "wythers:deep_dark_incursion", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_autumn.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_autumn.json index 9f35dceb05..3db96bc3a2 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_autumn.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_autumn.json @@ -9,6 +9,38 @@ { "id": "terralith:skylands_autumn", "required": false + }, + { + "id": "wythers:autumnal_birch_forest", + "required": false + }, + { + "id": "wythers:autumnal_crags", + "required": false + }, + { + "id": "wythers:autumnal_flower_forest", + "required": false + }, + { + "id": "wythers:autumnal_forest_edge", + "required": false + }, + { + "id": "wythers:autumnal_forest", + "required": false + }, + { + "id": "wythers:autumnal_plains", + "required": false + }, + { + "id": "wythers:autumnal_swamp", + "required": false + }, + { + "id": "wythers:harvest_fields", + "required": false } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_badlands.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_badlands.json index 3dec9368f1..bf1c68821c 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_badlands.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_badlands.json @@ -17,6 +17,10 @@ { "id": "terralith:white_mesa", "required": false + }, + { + "id": "wythers:danakil_desert", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_bamboo.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_bamboo.json index 3ababe37a2..b96ea7b730 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_bamboo.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_bamboo.json @@ -1,6 +1,38 @@ { "replace": false, "values": [ - "minecraft:bamboo_jungle" + "minecraft:bamboo_jungle", + { + "id": "wythers:bamboo_jungle_canyon", + "required": false + }, + { + "id": "wythers:bamboo_jungle_highlands", + "required": false + }, + { + "id": "wythers:bamboo_jungle_swamp", + "required": false + }, + { + "id": "wythers:bamboo_swamp", + "required": false + }, + { + "id": "wythers:jade_highlands", + "required": false + }, + { + "id": "wythers:sakura_forest", + "required": false + }, + { + "id": "wythers:sandy_jungle", + "required": false + }, + { + "id": "wythers:sparse_bamboo_jungle", + "required": false + } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_beach.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_beach.json new file mode 100644 index 0000000000..3a300f9742 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_beach.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "minecraft:snowy_beach", + "minecraft:beach", + { + "id": "wythers:guelta", + "required": false + }, + { + "id": "wythers:sand_dunes", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cave.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cave.json index 895857a91a..a3c8aaf7a8 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cave.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cave.json @@ -34,6 +34,62 @@ { "id": "terralith:cave/underground_jungle", "required": false + }, + { + "id": "wythers:calcite_caverns", + "required": false + }, + { + "id": "wythers:deep_dark_incursion", + "required": false + }, + { + "id": "wythers:deep_underground", + "required": false + }, + { + "id": "wythers:fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lichenous_caves", + "required": false + }, + { + "id": "wythers:lichenous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_shroom_caves", + "required": false + }, + { + "id": "wythers:mossy_caves", + "required": false + }, + { + "id": "wythers:mossy_dripstone_caves", + "required": false + }, + { + "id": "wythers:mushroom_caves", + "required": false + }, + { + "id": "wythers:underground", + "required": false + }, + { + "id": "wythers:volcanic_chamber", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_coast.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_coast.json index b500abc5b9..8a0c581a2e 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_coast.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_coast.json @@ -14,6 +14,58 @@ { "id": "terralith:white_cliffs", "required": false + }, + { + "id": "wythers:calcite_coast", + "required": false + }, + { + "id": "wythers:coastal_mangroves", + "required": false + }, + { + "id": "wythers:cold_island", + "required": false + }, + { + "id": "wythers:cold_stony_shore", + "required": false + }, + { + "id": "wythers:deepslate_shore", + "required": false + }, + { + "id": "wythers:frigid_island", + "required": false + }, + { + "id": "wythers:frozen_island", + "required": false + }, + { + "id": "wythers:gravelly_beach", + "required": false + }, + { + "id": "wythers:icy_shore", + "required": false + }, + { + "id": "wythers:mediterranean_island", + "required": false + }, + { + "id": "wythers:temperate_island", + "required": false + }, + { + "id": "wythers:tropical_island", + "required": false + }, + { + "id": "wythers:warm_stony_shore", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cold.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cold.json index 7687696141..1ed3fce884 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cold.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cold.json @@ -9,6 +9,22 @@ { "id": "#byg:is_cold", "required": false + }, + { + "id": "wythers:berry_bog", + "required": false + }, + { + "id": "wythers:cold_island", + "required": false + }, + { + "id": "wythers:cold_plains", + "required": false + }, + { + "id": "wythers:cold_stony_shore", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep.json index f8aba67df7..8cf19959f6 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "#minecraft:is_deep_ocean" + "#minecraft:is_deep_ocean", + { + "id": "wythers:deep_icy_ocean", + "required": false + } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_desert.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_desert.json index 09d4b6c363..e7790f68a2 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_desert.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_desert.json @@ -37,6 +37,34 @@ { "id": "terralith:sandstone_valley", "required": false + }, + { + "id": "#wythers:is_desert", + "required": false + }, + { + "id": "wythers:badlands_desert", + "required": false + }, + { + "id": "wythers:desert_island", + "required": false + }, + { + "id": "wythers:kwongan_heath", + "required": false + }, + { + "id": "wythers:outback_desert", + "required": false + }, + { + "id": "wythers:red_desert", + "required": false + }, + { + "id": "wythers:sandy_jungle", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_dripstone.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_dripstone.json index e378c5e7cb..11cea8d732 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_dripstone.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_dripstone.json @@ -9,6 +9,26 @@ { "id": "terralith:stony_spires", "required": false + }, + { + "id": "wythers:fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lichenous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:mossy_dripstone_caves", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json index e603ae8ca4..75b2b89ca0 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_floral.json @@ -56,6 +56,34 @@ { "id": "terralith:sakura_valley", "required": false + }, + { + "id": "wythers:autumnal_flower_forest", + "required": false + }, + { + "id": "wythers:flowering_pantanal", + "required": false + }, + { + "id": "wythers:jacaranda_savanna", + "required": false + }, + { + "id": "wythers:lapacho_plains", + "required": false + }, + { + "id": "wythers:sakura_forest", + "required": false + }, + { + "id": "wythers:spring_flower_fields", + "required": false + }, + { + "id": "wythers:spring_flower_forest", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json index f7d74ead02..ef6aa0897e 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_forest.json @@ -42,6 +42,34 @@ { "id": "terralith:temperate_highlands", "required": false + }, + { + "id": "wythers:dry_tropical_forest", + "required": false + }, + { + "id": "wythers:birch_taiga", + "required": false + }, + { + "id": "wythers:boreal_forest_red", + "required": false + }, + { + "id": "wythers:boreal_forest_yellow", + "required": false + }, + { + "id": "wythers:subtropical_forest", + "required": false + }, + { + "id": "wythers:tangled_forest", + "required": false + }, + { + "id": "wythers:tropical_forest", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freezing.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freezing.json index b0089b7cf9..b70ef2b3f0 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freezing.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freezing.json @@ -28,6 +28,30 @@ { "id": "terralith:snowy_badlands", "required": false + }, + { + "id": "wythers:crimson_tundra", + "required": false + }, + { + "id": "wythers:frozen_island", + "required": false + }, + { + "id": "wythers:snowy_bog", + "required": false + }, + { + "id": "wythers:snowy_canyon", + "required": false + }, + { + "id": "wythers:snowy_peaks", + "required": false + }, + { + "id": "wythers:snowy_tundra", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frigid.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frigid.json index 389b64f9ef..767029a00a 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frigid.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frigid.json @@ -3,6 +3,14 @@ "values": [ "minecraft:cold_ocean", "minecraft:deep_cold_ocean", - "#cobblemon:is_frozen" + "#cobblemon:is_frozen", + { + "id": "wythers:icy_ocean", + "required": false + }, + { + "id": "wythers:icy_river", + "required": false + } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen.json index f84dcff93f..d6ec0a2557 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen.json @@ -2,6 +2,14 @@ "replace": false, "values": [ "minecraft:deep_frozen_ocean", - "minecraft:frozen_ocean" + "minecraft:frozen_ocean", + { + "id": "wythers:deep_icy_ocean", + "required": false + }, + { + "id": "wythers:icy_ocean", + "required": false + } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_glacial.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_glacial.json index 182ab0778f..ab958e4175 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_glacial.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_glacial.json @@ -18,6 +18,22 @@ { "id": "terralith:glacial_chasm", "required": false + }, + { + "id": "wythers:glacial_cliffs", + "required": false + }, + { + "id": "wythers:ice_cap", + "required": false + }, + { + "id": "wythers:icy_crags", + "required": false + }, + { + "id": "wythers:frozen_island", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_highlands.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_highlands.json index 27e3668392..b9c7847f4e 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_highlands.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_highlands.json @@ -17,6 +17,38 @@ { "id": "terralith:highlands", "required": false + }, + { + "id": "wythers:bamboo_jungle_highlands", + "required": false + }, + { + "id": "wythers:eucalyptus_deanei_forest", + "required": false + }, + { + "id": "wythers:forested_highlands", + "required": false + }, + { + "id": "wythers:highlands", + "required": false + }, + { + "id": "wythers:huangshan_highlands", + "required": false + }, + { + "id": "wythers:highland_tropical_rainforest", + "required": false + }, + { + "id": "wythers:jade_highlands", + "required": false + }, + { + "id": "wythers:wistman_woods", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_hills.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_hills.json index e517eede54..229dee22eb 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_hills.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_hills.json @@ -38,6 +38,37 @@ { "id": "terralith:yosemite_lowlands", "required": false + }, + { + "id": "wythers:autumnal_crags", + "required": false + }, + { + "id": "wythers:ayers_rock", + "required": false + }, + { + "id": "wythers:icy_crags", + "required": false + }, { + "id": "wythers:old_growth_taiga_crags", + "required": false + }, + { + "id": "wythers:taiga_crags", + "required": false + }, + { + "id": "wythers:temperate_rainforest_crags", + "required": false + }, + { + "id": "wythers:thermal_taiga_crags", + "required": false + }, + { + "id": "wythers:windswept_jungle", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_island.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_island.json index 4933c4a5f1..b61f9a2c3f 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_island.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_island.json @@ -21,6 +21,46 @@ { "id": "terralith:warped_mesa", "required": false + }, + { + "id": "wythers:cold_island", + "required": false + }, + { + "id": "wythers:desert_island", + "required": false + }, + { + "id": "wythers:frigid_island", + "required": false + }, + { + "id": "wythers:frozen_island", + "required": false + }, + { + "id": "wythers:jungle_island", + "required": false + }, + { + "id": "wythers:mediterranean_island", + "required": false + }, + { + "id": "wythers:mediterranean_island_thermal_springs", + "required": false + }, + { + "id": "wythers:mushroom_island", + "required": false + }, + { + "id": "wythers:temperate_island", + "required": false + }, + { + "id": "wythers:tropical_island", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_jungle.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_jungle.json index b2f9b20028..26440cfb13 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_jungle.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_jungle.json @@ -5,6 +5,62 @@ { "id": "terralith:cave/underground_jungle", "required": false + }, + { + "id": "wythers:dripleaf_swamp", + "required": false + }, + { + "id": "wythers:eucalyptus_deanei_forest", + "required": false + }, + { + "id": "wythers:eucalyptus_deanei_forest", + "required": false + }, + { + "id": "wythers:highland_tropical_rainforest", + "required": false + }, + { + "id": "wythers:humid_tropical_grassland", + "required": false + }, + { + "id": "wythers:jungle_canyon", + "required": false + }, + { + "id": "wythers:subtropical_forest", + "required": false + }, + { + "id": "wythers:subtropical_forest_edge", + "required": false + }, + { + "id": "wythers:subtropical_grassland", + "required": false + }, + { + "id": "wythers:tropical_forest", + "required": false + }, + { + "id": "wythers:tropical_forest_canyon", + "required": false + }, + { + "id": "wythers:tropical_grassland", + "required": false + }, + { + "id": "wythers:tropical_island", + "required": false + }, + { + "id": "wythers:tropical_rainforest", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm.json index f842e29d7c..e9d9d0ec37 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "minecraft:deep_lukewarm_ocean", - "minecraft:lukewarm_ocean" + "minecraft:lukewarm_ocean", + { + "id": "wythers:tropical_beach", + "required": false + }, + { + "id": "wythers:tropical_island", + "required": false + }, + { + "id": "wythers:warm_stony_shore", + "required": false + } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lush.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lush.json index 22568c93b2..bf39c1f5a0 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lush.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lush.json @@ -9,6 +9,34 @@ { "id": "terralith:cave/underground_jungle", "required": false + }, + { + "id": "wythers:ancient_mossy_swamp", + "required": false + }, + { + "id": "wythers:lichenous_caves", + "required": false + }, + { + "id": "wythers:lichenous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_shroom_caves", + "required": false + }, + { + "id": "wythers:waterlily_swamp", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_magical.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_magical.json index 2bcb697bb1..b8c2dbb584 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_magical.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_magical.json @@ -5,6 +5,10 @@ { "id": "#byg:is_magical", "required": false + }, + { + "id": "#wythers:is_dark_forest", + "required": false }, { "id": "byg:skyris_vale", @@ -29,6 +33,18 @@ { "id": "terralith:moonlight_valley", "required": false + }, + { + "id": "wythers:lantern_river", + "required": false + }, + { + "id": "wythers:mushroom_island", + "required": false + }, + { + "id": "wythers:snowy_thermal_taiga", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mountain.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mountain.json index b31b50a416..dcdc73a4fa 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mountain.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mountain.json @@ -18,6 +18,26 @@ { "id": "terralith:yosemite_cliffs", "required": false + }, + { + "id": "wythers:ayers_rock", + "required": false + }, + { + "id": "wythers:tibesti_mountains", + "required": false + }, + { + "id": "wythers:tropical_volcano", + "required": false + }, + { + "id": "wythers:tsingy_forest", + "required": false + }, + { + "id": "wythers:volcano", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mushroom.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mushroom.json index 10a1dc7e49..f661e3ca1b 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mushroom.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mushroom.json @@ -10,6 +10,34 @@ { "id": "terralith:mirage_isles", "required": false + }, + { + "id": "wythers:ancient_taiga", + "required": false + }, + { + "id": "wythers:deep_dark_incursion", + "required": false + }, + { + "id": "wythers:fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_fungous_dripstone_caves", + "required": false + }, + { + "id": "wythers:lush_shroom_caves", + "required": false + }, + { + "id": "wythers:mushroom_caves", + "required": false + }, + { + "id": "wythers:mushroom_island", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_peak.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_peak.json index 8595b1a64d..e76ef18c2d 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_peak.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_peak.json @@ -20,6 +20,26 @@ { "id": "terralith:windswept_spires", "required": false + }, + { + "id": "wythers:andesite_crags", + "required": false + }, + { + "id": "wythers:aspen_crags", + "required": false + }, + { + "id": "wythers:cool_stony_peaks", + "required": false + }, + { + "id": "wythers:icy_volcano", + "required": false + }, + { + "id": "wythers:snowy_peaks", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plains.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plains.json index 153cf9fd02..ad072bfacb 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plains.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plains.json @@ -19,6 +19,62 @@ { "id": "terralith:valley_clearing", "required": false + }, + { + "id": "wythers:autumnal_plains", + "required": false + }, + { + "id": "wythers:berry_bog", + "required": false + }, + { + "id": "wythers:cold_plains", + "required": false + }, + { + "id": "wythers:cool_forest_edge", + "required": false + }, + { + "id": "wythers:cool_plains", + "required": false + }, + { + "id": "wythers:dry_tropical_grassland", + "required": false + }, + { + "id": "wythers:forest_edge", + "required": false + }, + { + "id": "wythers:harvest_fields", + "required": false + }, + { + "id": "wythers:highland_plains", + "required": false + }, + { + "id": "wythers:humid_tropical_grassland", + "required": false + }, + { + "id": "wythers:spring_flower_fields", + "required": false + }, + { + "id": "terralith:subtropical_forest_edge", + "required": false + }, + { + "id": "wythers:subtropical_grassland", + "required": false + }, + { + "id": "wythers:tropical_grassland", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plateau.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plateau.json index 9c92373a40..7a8a094af9 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plateau.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_plateau.json @@ -5,6 +5,10 @@ { "id": "#byg:is_plateau", "required": false + }, + { + "id": "wythers:ayers_rock", + "required": false } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_river.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_river.json index 3f5c0bb93b..7f0ff4ec67 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_river.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_river.json @@ -5,6 +5,14 @@ { "id": "terralith:warm_river", "required": false + }, + { + "id": "wythers:guelta", + "required": false + }, + { + "id": "wythers:tropical_forest_river", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_salt.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_salt.json new file mode 100644 index 0000000000..4a36fffcfb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_salt.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + { + "id": "wythers:calcite_caverns", + "required": false + }, + { + "id": "wythers:calcite_coast", + "required": false + }, + { + "id": "wythers:mediterranean_island_thermal_spring", + "required": false + }, + { + "id": "wythers:salt_lakes_pink", + "required": false + }, + { + "id": "wythers:salt_lakes_turquoise", + "required": false + }, + { + "id": "wythers:salt_lakes_white", + "required": false + }, + { + "id": "wythers:thermal_taiga", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_savanna.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_savanna.json index 232c58f45c..fd9e3d8e9f 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_savanna.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_savanna.json @@ -41,6 +41,18 @@ { "id": "terralith:shrubland", "required": false + }, + { + "id": "wythers:granite_canyon", + "required": false + }, + { + "id": "wythers:tropical_forest_canyon", + "required": false + }, + { + "id": "wythers:tropical_forest", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_snowy.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_snowy.json index 55de3e95fc..332caab9e4 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_snowy.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_snowy.json @@ -38,6 +38,26 @@ { "id": "terralith:wintry_lowlands", "required": false + }, + { + "id": "wythers:deep_snowy_taiga", + "required": false + }, + { + "id": "wythers:huangshan_highlands", + "required": false + }, + { + "id": "wythers:jade_highlands", + "required": false + }, + { + "id": "wythers:snowy_fen", + "required": false + }, + { + "id": "wythers:snowy_thermal_taiga", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spooky.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spooky.json index d4f1ba8abb..4b4821df36 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spooky.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spooky.json @@ -9,6 +9,26 @@ { "id": "byg:ebony_woods", "required": false + }, + { + "id": "#wythers:dark_forest", + "required": false + }, + { + "id": "wythers:ancient_taiga", + "required": false + }, + { + "id": "wythers:bayou", + "required": false + }, + { + "id": "wythers:deep_dark_forest", + "required": false + }, + { + "id": "wythers:tangled_forest", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spring.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spring.json index dd8d7d1c97..6bf1cad222 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spring.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_spring.json @@ -8,6 +8,14 @@ { "id": "terralith:skylands_spring", "required": false + }, + { + "id": "wythers:spring_flower_fields", + "required": false + }, + { + "id": "wythers:spring_flower_forest", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_swamp.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_swamp.json index d98b7c9986..a5b12f05aa 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_swamp.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_swamp.json @@ -14,6 +14,22 @@ { "id": "terralith:orchid_swamp", "required": false - } + }, + { + "id": "#wythers:is_swamp", + "required": false + }, + { + "id": "wythers:ancient_oak_swamp", + "required": false + }, + { + "id": "wythers:billabong", + "required": false + }, + { + "id": "wythers:flooded_jungle", + "required": false + } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_taiga.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_taiga.json index 688e2062bc..16d8f8710d 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_taiga.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_taiga.json @@ -46,6 +46,14 @@ { "id": "terralith:wintry_lowlands", "required": false + }, + { + "id": "wythers:snowy_thermal_taiga", + "required": false + }, + { + "id": "wythers:ancient_taiga", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_thermal.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_thermal.json index d871d730ab..ee81c90c48 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_thermal.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_thermal.json @@ -12,6 +12,34 @@ { "id": "terralith:yellowstone", "required": false + }, + { + "id": "wythers:calcite_caverns", + "required": false + }, + { + "id": "wythers:mediterranean_island_thermal_springs", + "required": false + }, + { + "id": "wythers:snowy_thermal_taiga", + "required": false + }, + { + "id": "wythers:thermal_taiga_crags", + "required": false + }, + { + "id": "wythers:thermal_taiga", + "required": false + }, + { + "id": "wythers:tibesti_mountains", + "required": false + }, + { + "id": "wythers:danakil_desert", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tropical.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tropical.json new file mode 100644 index 0000000000..7e1d9ae118 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tropical.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + { + "id": "wythers:tropical_beach", + "required": false + }, + { + "id": "wythers:tropical_island", + "required": false + }, + { + "id": "wythers:tropical_volcano", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tundra.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tundra.json index b7fe307a41..f57fa0c212 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tundra.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tundra.json @@ -26,6 +26,30 @@ { "id": "terralith:yellowstone", "required": false + }, + { + "id": "wythers:crimson_tundra", + "required": false + }, + { + "id": "wythers:frigid_island", + "required": false + }, + { + "id": "wythers:ice_cap", + "required": false + }, + { + "id": "wythers:icy_crags", + "required": false + }, + { + "id": "wythers:snowy_tundra", + "required": false + }, + { + "id": "wythers:tundra", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_volcanic.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_volcanic.json index 8e9a4758a2..5281b32fd5 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_volcanic.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_volcanic.json @@ -12,6 +12,26 @@ { "id": "terralith:volcanic_peaks", "required": false + }, + { + "id": "wythers:icy_volcano", + "required": false + }, + { + "id": "wythers:tropical_volcano", + "required": false + }, + { + "id": "wythers:volcano", + "required": false + }, + { + "id": "wythers:volcanic_chamber", + "required": false + }, + { + "id": "wythers:volcanic_crater", + "required": false } ] } diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_winter.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_winter.json index fba91d19c0..585b024780 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_winter.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_winter.json @@ -5,6 +5,10 @@ { "id": "terralith:skylands_winter", "required": false + }, + { + "id": "wythers:deep_snowy_taiga", + "required": false } ] } From 8431e25c31198fa20d301880b85ce927608dc100 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Thu, 21 Sep 2023 17:02:37 -0400 Subject: [PATCH 13/40] Fixed error that caused build to fail. --- .../data/cobblemon/spawn_pool_world/0083_farfetchd.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json index ab000bec59..0ae04a62fc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0083_farfetchd.json @@ -41,7 +41,7 @@ "id": "farfetchd-galarian-1", "pokemon": "farfetchd galarian", "presets": [ - "natural" + "natural", "wild" ], "type": "pokemon", From 7bc9778ce37e30f966e330ca17c0aa1ae7a71fe0 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 14:20:07 +0000 Subject: [PATCH 14/40] gen 2 drops --- .../species/generation2/ampharos.json | 10 ++++++++ .../species/generation2/ariados.json | 24 +++++++++++++++++++ .../species/generation2/azumarill.json | 10 ++++++++ .../cobblemon/species/generation2/celebi.json | 9 +++++++ .../species/generation2/chinchou.json | 9 +++++++ .../species/generation2/croconaw.json | 9 +++++++ .../species/generation2/cyndaquil.json | 9 +++++++ .../species/generation2/feraligatr.json | 9 +++++++ .../species/generation2/flaaffy.json | 14 +++++++++++ .../cobblemon/species/generation2/gligar.json | 13 ++++++++++ .../species/generation2/granbull.json | 15 ++++++++++++ .../species/generation2/hoothoot.json | 17 +++++++++++++ .../species/generation2/lanturn.json | 10 ++++++++ .../cobblemon/species/generation2/mareep.json | 3 ++- .../species/generation2/noctowl.json | 17 +++++++++++++ .../cobblemon/species/generation2/phanpy.json | 9 +++++++ .../species/generation2/quilava.json | 9 +++++++ .../species/generation2/shuckle.json | 8 +++++++ .../cobblemon/species/generation2/slugma.json | 13 ++++++++++ .../species/generation2/snubbull.json | 13 ++++++++++ .../species/generation2/spinarak.json | 16 +++++++++++++ .../species/generation2/sudowoodo.json | 9 +++++++ .../species/generation2/totodile.json | 9 +++++++ .../species/generation2/typhlosion.json | 9 +++++++ .../cobblemon/species/generation2/yanma.json | 9 +++++++ 25 files changed, 281 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index a5884e3faf..85db09ad1f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -7,6 +7,16 @@ "static", "h:plus" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:raw_mutton", + "quantityRange": "2-4", + "percentage": 100 + } + ] + }, "baseStats": { "hp": 90, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json index 0a3a1a9533..9dae60c4c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json @@ -9,6 +9,30 @@ "insomnia", "h:sniper" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:spider_eye", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "1-3", + "percentage": 100 + } + ] + }, "baseStats": { "hp": 70, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json index 93c05b297d..5f850869b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json @@ -8,6 +8,16 @@ "hugepower", "h:sapsipper" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:kebia_berry", + "quantityRange": "1-2", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 100, "attack": 50, 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 6cadfb0a42..b3ad1a6db5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json @@ -14,6 +14,15 @@ "special_defence": 100, "speed": 100 }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 100 + } + ] + }, "catchRate": 45, "maleRatio": -1, "shoulderMountable": false, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json index 014be4d81f..f50b483945 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json @@ -9,6 +9,15 @@ "illuminate", "h:waterabsorb" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:prismarine_crystal", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 75, "attack": 38, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json index 3e2c61e9fe..f94e286b41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json @@ -7,6 +7,15 @@ "torrent", "h:sheerforce" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 65, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json index eac43d3b60..46b12382df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json @@ -7,6 +7,15 @@ "blaze", "h:flashfire" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 39, "attack": 52, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json index dfb79da701..7023ba1111 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json @@ -7,6 +7,15 @@ "torrent", "h:sheerforce" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 20 + } + ] + }, "baseStats": { "hp": 85, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json index 3c3f71914a..eef18da09d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json @@ -7,6 +7,20 @@ "static", "h:plus" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_mutton", + "quantityRange": "1-3", + "percentage": 100 + }, + { + "item": "minecraft:white_wool", + "percentage": 100 + } + ] + }, "baseStats": { "hp": 70, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json index 0741899252..f96e6e90da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json @@ -9,6 +9,19 @@ "sandveil", "h:immunity" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:razor_fang", + "percentage": 2.5 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 65, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json index f158f6c123..30a972e7e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json @@ -8,6 +8,21 @@ "quickfeet", "h:rattled" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 90, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json index eee0376527..7a8f6930b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json @@ -9,6 +9,23 @@ "keeneye", "h:tintedlens" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:raw_chicken", + "percentage": 100 + }, + { + "item": "cobblemon:wise_glasses", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json index 9768bde876..340ae979b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json @@ -9,6 +9,16 @@ "illuminate", "h:waterabsorb" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:prismarine_crystal", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 125, "attack": 58, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json index a0f83094a5..2c85f91cde 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json @@ -44,7 +44,8 @@ "percentage": 66 }, { - "item": "minecraft:white_wool" + "item": "minecraft:white_wool", + "quantityRange": "1-2" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json index 5989cca99c..63ab4a69c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json @@ -9,6 +9,23 @@ "keeneye", "h:tintedlens" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:wise_glasses", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 100, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json index af4560f969..c7bc50a597 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json @@ -7,6 +7,15 @@ "pickup", "h:sandveil" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:prismarine_crystal", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 90, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json index 73a4f7fdfd..55f3e01284 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json @@ -7,6 +7,15 @@ "blaze", "h:flashfire" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 58, "attack": 64, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json b/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json index 6a362c87e3..62a3f94dde 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json @@ -9,6 +9,14 @@ "gluttony", "h:contrary" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:berry_juice" + } + ] + }, "baseStats": { "hp": 20, "attack": 10, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json index eea3cf703e..6e5321caa0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json @@ -8,6 +8,19 @@ "flamebody", "h:weakarmor" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:magma_cream", + "percentage": 50 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json index 78f12a61e1..3d5a7378db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json @@ -8,6 +8,19 @@ "runaway", "h:rattled" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 60, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json index 529afeb4cf..8cd444d965 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json @@ -9,6 +9,22 @@ "insomnia", "h:sniper" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + }, + { + "item": "minecraft:spider_eye", + "percentage": 50 + }, + { + "item": "minecraft:rotten_flesh" + } + ] + }, "baseStats": { "hp": 40, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json index 8d2eac29f7..c265839fb0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json @@ -8,6 +8,15 @@ "rockhead", "h:rattled" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:hard_stone", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json index e207a87eb2..5e17db85c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json @@ -7,6 +7,15 @@ "torrent", "h:sheerforce" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 50, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json index 7648b965db..623ea9b079 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json @@ -7,6 +7,15 @@ "blaze", "h:flashfire" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 20 + } + ] + }, "baseStats": { "hp": 78, "attack": 84, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json index 31ba8c2181..7618282f8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json @@ -9,6 +9,15 @@ "compoundeyes", "h:frisk" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:wide_lens", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 65, From d53c17bc8e991dbbe40dd636d78132f4d5b96d94 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 15:00:24 +0000 Subject: [PATCH 15/40] gen 3 drops --- .../species/generation3/barboach.json | 9 ++++++++ .../cobblemon/species/generation3/beldum.json | 9 ++++++++ .../species/generation3/breloom.json | 15 +++++++++++++ .../cobblemon/species/generation3/cacnea.json | 13 +++++++++++ .../species/generation3/cacturne.json | 14 ++++++++++++ .../species/generation3/camerupt.json | 14 ++++++++++++ .../species/generation3/chimecho.json | 10 +++++++++ .../species/generation3/dusclops.json | 14 ++++++++++++ .../species/generation3/duskull.json | 13 +++++++++++ .../species/generation3/gardevoir.json | 13 +++++++++++ .../species/generation3/gorebyss.json | 9 ++++++++ .../species/generation3/huntail.json | 9 ++++++++ .../species/generation3/illumise.json | 9 ++++++++ .../cobblemon/species/generation3/kirlia.json | 14 ++++++++++++ .../species/generation3/loudred.json | 10 +++++++++ .../species/generation3/masquerain.json | 9 ++++++++ .../species/generation3/metagross.json | 9 ++++++++ .../cobblemon/species/generation3/metang.json | 9 ++++++++ .../species/generation3/mightyena.json | 15 +++++++++++++ .../species/generation3/nosepass.json | 13 +++++++++++ .../cobblemon/species/generation3/numel.json | 13 +++++++++++ .../species/generation3/pelipper.json | 18 +++++++++++++++ .../species/generation3/poochyena.json | 13 +++++++++++ .../cobblemon/species/generation3/ralts.json | 13 +++++++++++ .../species/generation3/relicanth.json | 9 ++++++++ .../species/generation3/shroomish.json | 17 ++++++++++++++ .../species/generation3/swellow.json | 22 +++++++++++++++++++ .../species/generation3/taillow.json | 17 ++++++++++++++ .../species/generation3/volbeat.json | 9 ++++++++ .../species/generation3/whiscash.json | 10 +++++++++ .../species/generation3/whismur.json | 9 ++++++++ .../species/generation3/wingull.json | 16 ++++++++++++++ 32 files changed, 396 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json index 63fb35a3a7..c30414f2d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json @@ -9,6 +9,15 @@ "anticipation", "h:hydration" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 50, "attack": 48, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beldum.json b/common/src/main/resources/data/cobblemon/species/generation3/beldum.json index d5bd3add70..1456a1d1ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beldum.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beldum.json @@ -8,6 +8,15 @@ "clearbody", "h:lightmetal" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json index 8a1bf364c6..d728d39d2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json @@ -9,6 +9,21 @@ "poisonheal", "h:technician" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:brown_mushroom", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:kasib_berry", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 60, "attack": 130, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json index 874f4603b6..f125f0ef32 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json @@ -7,6 +7,19 @@ "sandveil", "h:waterabsorb" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:cactus", + "percentage": 50 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json index 6effac6f87..7a21a826a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json @@ -8,6 +8,20 @@ "sandveil", "h:waterabsorb" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:cactus", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json index fd5edc885b..c7fc814a6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -9,6 +9,20 @@ "solidrock", "h:angerpoint" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:magma_cream", + "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json index 1bbda1d5ff..540d256d99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json @@ -6,6 +6,16 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:colbur_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json index c0fa7006f7..9c58d10dc8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json @@ -7,6 +7,20 @@ "pressure", "h:frisk" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:reaper_cloth", + "percentage": 5 + }, + { + "item": "cobblemon:kasib_berry", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 40, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/duskull.json b/common/src/main/resources/data/cobblemon/species/generation3/duskull.json index 05c8017bdf..aa0d6b3481 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/duskull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/duskull.json @@ -7,6 +7,19 @@ "levitate", "h:frisk" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:reaper_cloth", + "percentage": 2.5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 20, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json index 7047a86d28..9cdf978779 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json @@ -9,6 +9,19 @@ "trace", "h:telepathy" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:ender_pearl", + "percentage": 75 + }, + { + "item": "cobblemon:twisted_spoon", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 68, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json index 48dcae7b6f..343ed24b04 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json @@ -7,6 +7,15 @@ "swiftswim", "h:hydration" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:deep_sea_scale", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 55, "attack": 84, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json index 19fc0a810d..9f46ddb254 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json @@ -7,6 +7,15 @@ "swiftswim", "h:waterveil" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:deep_sea_tooth", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 55, "attack": 104, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json index 71b1cfe7ba..805f18a8d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json @@ -8,6 +8,15 @@ "tintedlens", "h:prankster" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:glowstone_dust", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 65, "attack": 47, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json index f9395de419..59e5c3c9ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json @@ -9,6 +9,20 @@ "trace", "h:telepathy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:ender_pearl", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:twisted_spoon", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 38, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json index 1c64e514a2..9966e4c3a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -7,6 +7,16 @@ "soundproof", "h:scrappy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 84, "attack": 71, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json index 556d2035cc..a5d6617c09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json @@ -8,6 +8,15 @@ "intimidate", "h:unnerve" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:silver_powder", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 70, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json index f5f4ebb9da..e819977093 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json @@ -8,6 +8,15 @@ "clearbody", "h:lightmetal" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 80, "attack": 135, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metang.json b/common/src/main/resources/data/cobblemon/species/generation3/metang.json index b78d76a0d8..44b79b9c19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metang.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metang.json @@ -8,6 +8,15 @@ "clearbody", "h:lightmetal" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json index 0da90159a2..7cd00f9d3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json @@ -8,6 +8,21 @@ "quickfeet", "h:moxie" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 70, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json index 7e1f9aab3f..5cf5cf7716 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json @@ -8,6 +8,19 @@ "magnetpull", "h:sandforce" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:flint", + "percentage": 50 + }, + { + "item": "cobblemon:magnet", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 30, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/numel.json b/common/src/main/resources/data/cobblemon/species/generation3/numel.json index fce1d75f79..6b2ea038e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/numel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/numel.json @@ -9,6 +9,19 @@ "simple", "h:owntempo" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:magma_cream", + "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json index fb7e2ee4ff..8581c59df1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json @@ -9,6 +9,24 @@ "drizzle", "h:raindish" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:wacan_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json index df118ec149..cd149601f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json @@ -8,6 +8,19 @@ "quickfeet", "h:rattled" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 35, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json index d45fb79ed8..d1c089bc1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json @@ -9,6 +9,19 @@ "trace", "h:telepathy" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:ender_pearl", + "percentage": 50 + }, + { + "item": "cobblemon:twisted_spoon", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 28, "attack": 25, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json index 53547e0815..39e65851ef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json @@ -9,6 +9,15 @@ "rockhead", "h:sturdy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:deep_sea_scale", + "percentage": 20 + } + ] + }, "baseStats": { "hp": 100, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json index 6e191f9cfe..37be35aade 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json @@ -8,6 +8,23 @@ "poisonheal", "h:quickfeet" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:brown_mushroom", + "percentage": 50 + }, + { + "item": "cobblemon:big_root", + "percentage": 2.5 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index 9367bf7c3e..7953bfc41a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json @@ -8,6 +8,28 @@ "guts", "h:scrappy" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + }, + { + "item": "cobblemon:charti_berry", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 60, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json index 91d2866d4e..9dd94b2a29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json @@ -8,6 +8,23 @@ "guts", "h:scrappy" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:charti_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 40, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json index ecfcbb18d7..a7588b6c5f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json @@ -8,6 +8,15 @@ "swarm", "h:prankster" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:glowstone_dust", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 65, "attack": 73, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json index b42b376227..268bea4c38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json @@ -9,6 +9,16 @@ "anticipation", "h:hydration" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:clay_ball", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 110, "attack": 78, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json index 951241cc66..8a07cdf7ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json @@ -7,6 +7,15 @@ "soundproof", "h:rattled" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 64, "attack": 51, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json index 661840890c..ed8639d837 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json @@ -9,6 +9,22 @@ "hydration", "h:raindish" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 30, From 403acf5822315f3501311ef0e2b1138d71a8fc91 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 16:49:30 +0000 Subject: [PATCH 16/40] gen 4 drops --- .../cobblemon/species/generation4/buizel.json | 15 +++++++++++++ .../species/generation4/carnivine.json | 9 ++++++++ .../cobblemon/species/generation4/chatot.json | 13 +++++++++++ .../cobblemon/species/generation4/combee.json | 9 ++++++++ .../species/generation4/floatzel.json | 15 +++++++++++++ .../cobblemon/species/generation4/luxio.json | 9 ++++++++ .../cobblemon/species/generation4/luxray.json | 9 ++++++++ .../species/generation4/pachirisu.json | 10 +++++++++ .../cobblemon/species/generation4/shinx.json | 10 +++++++++ .../species/generation4/staraptor.json | 22 +++++++++++++++++++ .../species/generation4/staravia.json | 22 +++++++++++++++++++ .../cobblemon/species/generation4/starly.json | 16 ++++++++++++++ .../species/generation4/vespiquen.json | 10 +++++++++ 13 files changed, 169 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json index 1385a7906c..8d12c96161 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json @@ -7,6 +7,21 @@ "swiftswim", "h:waterveil" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:snowball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:occa_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 55, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json index f6d623f60c..ed93ecceac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json @@ -6,6 +6,15 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:big_root", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 74, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json index 340dff3509..ccd50bedde 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json @@ -9,6 +9,19 @@ "tangledfeet", "h:bigpecks" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:raw_chicken" + } + ] + }, "baseStats": { "hp": 76, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/combee.json b/common/src/main/resources/data/cobblemon/species/generation4/combee.json index 9b6053f19d..eccdba05b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/combee.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/combee.json @@ -8,6 +8,15 @@ "honeygather", "h:hustle" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:honey_comb", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 30, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json index 44dbca34c8..0594ca1ee1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json @@ -7,6 +7,21 @@ "swiftswim", "h:waterveil" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_salmon", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:wacan_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 85, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json index e68bba6340..f6a46a7379 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json @@ -8,6 +8,15 @@ "intimidate", "h:guts" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:quick_claw", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index c503423324..4c448b649e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -8,6 +8,15 @@ "intimidate", "h:guts" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:quick_claw", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 80, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json index 2535939458..80ddafb76e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -8,6 +8,16 @@ "pickup", "h:voltabsorb" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 60, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json index 50f43fc0f5..13d4758295 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json @@ -8,6 +8,16 @@ "intimidate", "h:guts" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:quick_claw", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 45, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json index 4b4707004b..8086b6878b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json @@ -8,6 +8,28 @@ "intimidate", "h:reckless" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 5 + }, + { + "item": "cobblemon:yache_berry", + "quantityRange": "1-3", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 85, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json index cfc71b3df5..5c30e7dd39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json @@ -8,6 +8,28 @@ "intimidate", "h:reckless" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + }, + { + "item": "cobblemon:yache_berry", + "quantityRange": "1-2", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 55, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/starly.json b/common/src/main/resources/data/cobblemon/species/generation4/starly.json index c3a16ba435..66779053d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/starly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/starly.json @@ -8,6 +8,22 @@ "keeneye", "h:reckless" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:raw_chicken" + }, + { + "item": "cobblemon:yache_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json index f8a9851a24..1c228fa1d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json @@ -8,6 +8,16 @@ "pressure", "h:unnerve" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:honey_comb", + "quantityRange": "1-3", + "percentage": 75 + } + ] + }, "baseStats": { "hp": 70, "attack": 80, From c34a09430a598859f8a5828f719a9dfc20691f92 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 17:39:38 +0000 Subject: [PATCH 17/40] gen 5 drops --- .../species/generation5/alomomola.json | 17 +++++++++++++++++ .../species/generation5/boldore.json | 19 +++++++++++++++++++ .../species/generation5/bouffalant.json | 18 ++++++++++++++++++ .../species/generation5/cofagrigus.json | 10 ++++++++++ .../species/generation5/conkeldurr.json | 10 ++++++++++ .../species/generation5/cottonee.json | 9 +++++++++ .../species/generation5/crustle.json | 10 ++++++++++ .../species/generation5/dwebble.json | 14 ++++++++++++++ .../cobblemon/species/generation5/emolga.json | 10 ++++++++++ .../species/generation5/gigalith.json | 19 +++++++++++++++++++ .../cobblemon/species/generation5/golett.json | 14 ++++++++++++++ .../cobblemon/species/generation5/golurk.json | 15 +++++++++++++++ .../species/generation5/gothita.json | 10 ++++++++++ .../species/generation5/gothitelle.json | 10 ++++++++++ .../species/generation5/gothorita.json | 10 ++++++++++ .../species/generation5/gurdurr.json | 10 ++++++++++ .../species/generation5/herdier.json | 15 +++++++++++++++ .../species/generation5/lillipup.json | 13 +++++++++++++ .../species/generation5/maractus.json | 15 +++++++++++++++ .../cobblemon/species/generation5/patrat.json | 10 ++++++++++ .../cobblemon/species/generation5/pidove.json | 13 +++++++++++++ .../species/generation5/roggenrola.json | 18 ++++++++++++++++++ .../species/generation5/samurott.json | 15 +++++++++++++++ .../species/generation5/scolipede.json | 10 ++++++++++ .../species/generation5/stoutland.json | 15 +++++++++++++++ .../species/generation5/timburr.json | 10 ++++++++++ .../species/generation5/tranquill.json | 18 ++++++++++++++++++ .../species/generation5/unfezant.json | 18 ++++++++++++++++++ .../species/generation5/venipede.json | 10 ++++++++++ .../species/generation5/watchog.json | 11 +++++++++++ .../species/generation5/whimsicott.json | 10 ++++++++++ .../species/generation5/whirlipede.json | 10 ++++++++++ .../cobblemon/species/generation5/yamask.json | 10 ++++++++++ 33 files changed, 426 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json index 1cf6b83abb..531dda762e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json @@ -7,6 +7,23 @@ "hydration", "h:regenerator" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:cod" + }, + { + "item": "minecraft:bone_meal", + "percentage": 5 + }, + { + "item": "cobblemon:deep_sea_scale", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 165, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json index cadd445c0a..0300a2a8d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json @@ -8,6 +8,25 @@ "weakarmor", "h:sandforce" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:raw_copper", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:hard_stone", + "percentage": 5 + }, + { + "item": "cobblemon:black_augurite", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 70, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json index 0b51af17e1..816e92a5ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json @@ -8,6 +8,24 @@ "sapsipper", "h:soundproof" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:leather", + "quantityRange": "1-3" + }, + { + "item": "minecraft:beef", + "quantityRange": "2-4" + }, + { + "item": "minecraft:brown_wool", + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 95, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json index 828ec991b5..66163556d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json @@ -6,6 +6,16 @@ "abilities": [ "mummy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 58, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json index d24966e440..ef91b07c42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json @@ -8,6 +8,16 @@ "sheerforce", "h:ironfist" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:muscle_band", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 105, "attack": 140, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json index 8edbbb3ab1..72138798e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json @@ -9,6 +9,15 @@ "infiltrator", "h:chlorophyll" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:white_wool" + } + ] + }, + "baseStats": { "hp": 40, "attack": 27, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json index f32e55ad06..8f01481d09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json @@ -9,6 +9,16 @@ "shellarmor", "h:weakarmor" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:hard_stone", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 70, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json index 7bfa1a40c2..0675f48c72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json @@ -9,6 +9,20 @@ "shellarmor", "h:weakarmor" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 50 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 50, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json index cc59202fb3..4f60143d8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json @@ -8,6 +8,16 @@ "static", "h:motordrive" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 55, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json index 7b8e94f5cc..32db3b34f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json @@ -8,6 +8,25 @@ "sandstream", "h:sandforce" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:raw_copper", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:hard_stone", + "percentage": 10 + }, + { + "item": "cobblemon:black_augurite", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 85, "attack": 135, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golett.json b/common/src/main/resources/data/cobblemon/species/generation5/golett.json index eb5a345d12..b655272fc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golett.json @@ -9,6 +9,20 @@ "klutz", "h:noguard" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 50 + }, + { + "item": "cobblemon:light_clay", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 59, "attack": 74, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json index b78dfafb23..ef220311d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json @@ -9,6 +9,21 @@ "klutz", "h:noguard" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:light_clay", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 89, "attack": 124, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json index 91d38134ff..9a0a973a14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json @@ -7,6 +7,16 @@ "competitive", "h:shadowtag" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:twisted_spoon", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 45, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json index e274b6469f..91a02101e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json @@ -7,6 +7,16 @@ "competitive", "h:shadowtag" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:twisted_spoon", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 70, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json index cceccd0d27..830b382eb3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json @@ -7,6 +7,16 @@ "competitive", "h:shadowtag" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:twisted_spoon", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 60, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json index b6ede8cb85..09385ef71b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json @@ -8,6 +8,16 @@ "sheerforce", "h:ironfist" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:muscle_band", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 85, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json index a7d78b6510..c9a66bb9bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json @@ -8,6 +8,21 @@ "sandrush", "h:scrappy" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:blue_wool", + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 65, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json index addf6aaa48..dfc46c8e6c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json @@ -8,6 +8,19 @@ "pickup", "h:runaway" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + }, + { + "item": "minecraft:blue_wool" + } + ] + }, + "baseStats": { "hp": 45, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json index 2f796c57db..7a57ac8e90 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json @@ -8,6 +8,21 @@ "chlorophyll", "h:stormdrain" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:cactus", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 75, "attack": 86, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json index b487eb1b40..4097a2f03d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json @@ -8,6 +8,16 @@ "keeneye", "h:analytic" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:pinap_berry", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 45, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json index 0c5e6a5bd0..a54a431413 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json @@ -9,6 +9,19 @@ "superluck", "h:rivalry" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + } + ] + }, + "baseStats": { "hp": 50, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json index ed6ca45aff..df480613eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json @@ -8,6 +8,24 @@ "weakarmor", "h:sandforce" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:raw_copper", + "percentage": 50 + }, + { + "item": "cobblemon:hard_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:black_augurite", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 55, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index ea2349282c..7c65f1cd97 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -7,6 +7,21 @@ "torrent", "h:shellarmor" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:nautilus_shell", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:mystic_water", + "percentage": 20 + } + ] + }, + "baseStats": { "hp": 95, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json index 022f10462f..73207d1516 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json @@ -9,6 +9,16 @@ "swarm", "h:speedboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:poison_barb", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 60, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json index 3acd2c7945..152b1ab0a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json @@ -8,6 +8,21 @@ "sandrush", "h:scrappy" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "minecraft:blue_wool", + "quantityRange": "2-3" + } + ] + }, + "baseStats": { "hp": 85, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json index 49bb24f012..951b2860b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json @@ -8,6 +8,16 @@ "sheerforce", "h:ironfist" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:muscle_band", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 75, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json index 6dd880b045..acf014a246 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json @@ -9,6 +9,24 @@ "superluck", "h:rivalry" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 62, "attack": 77, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json index 80b21e3dc9..e15a783bb8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json @@ -9,6 +9,24 @@ "superluck", "h:rivalry" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 80, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json index de6bf6f328..e18c3e0f11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json @@ -9,6 +9,16 @@ "swarm", "h:speedboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 30, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json index f25be83017..0bed3a53f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json @@ -8,6 +8,17 @@ "keeneye", "h:analytic" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:pinap_berry", + "percentage": 5, + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 60, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json index 63d1e85204..a528feca47 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json @@ -9,6 +9,16 @@ "infiltrator", "h:chlorophyll" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:white_wool", + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 60, "attack": 67, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json index b35be07bbc..4a39fbf2e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json @@ -9,6 +9,16 @@ "swarm", "h:speedboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:poison_barb", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 40, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json index 55a5257603..00affedad2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json @@ -6,6 +6,16 @@ "abilities": [ "mummy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 38, "attack": 30, From b545e01aef116fe8fe8d3515fb6fe67e2c92001a Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 18:01:54 +0000 Subject: [PATCH 18/40] gen 6 drops --- .../cobblemon/species/generation5/patrat.json | 2 +- .../species/generation6/avalugg.json | 15 +++++++++++++++ .../species/generation6/bergmite.json | 13 +++++++++++++ .../species/generation6/bunnelby.json | 18 ++++++++++++++++++ .../species/generation6/diggersby.json | 19 +++++++++++++++++++ .../species/generation6/dragalge.json | 11 +++++++++++ .../species/generation6/fletchinder.json | 18 ++++++++++++++++++ .../species/generation6/fletchling.json | 13 +++++++++++++ .../species/generation6/greninja.json | 14 ++++++++++++++ .../species/generation6/phantump.json | 9 +++++++++ .../species/generation6/scatterbug.json | 10 ++++++++++ .../cobblemon/species/generation6/skrelp.json | 10 ++++++++++ .../cobblemon/species/generation6/spewpa.json | 11 +++++++++++ .../species/generation6/talonflame.json | 18 ++++++++++++++++++ .../species/generation6/trevenant.json | 10 ++++++++++ .../species/generation6/vivillon.json | 10 ++++++++++ 16 files changed, 200 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json index 4097a2f03d..90254ad93c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json @@ -12,7 +12,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:pinap_berry", + "item": "cobblemon:pinap_berry", "percentage": 2.5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json index fe3c550dcc..1e52495a27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json @@ -8,6 +8,21 @@ "icebody", "h:sturdy" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:blue_ice", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 95, "attack": 117, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json index b4eb0cc920..1b9f5d2342 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json @@ -8,6 +8,19 @@ "icebody", "h:sturdy" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:blue_ice", + "percentage": 50 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 55, "attack": 69, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json index 65a6ae6215..685fa24e7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json @@ -8,6 +8,24 @@ "cheekpouch", "h:hugepower" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:carrot", + "percentage": 50 + }, + { + "item": "minecraft:rabbit_hide", + "percentage": 5 + }, + { + "item": "minecraft:rabbit_foot", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 38, "attack": 36, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json index 6a3489e551..8f2e5a83e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json @@ -9,6 +9,25 @@ "cheekpouch", "h:hugepower" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:carrot", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:rabbit_hide", + "percentage": 10 + }, + { + "item": "minecraft:rabbit_foot", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 85, "attack": 56, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json index 984041cf11..2fa89297c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json @@ -9,6 +9,17 @@ "poisontouch", "h:adaptability" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:kelp", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 65, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json index 9424e6aee6..5538f96513 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json @@ -8,6 +8,24 @@ "flamebody", "h:galewings" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 62, "attack": 73, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json index fd90909429..4d4cc4002e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json @@ -8,6 +8,19 @@ "bigpecks", "h:galewings" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + } + ] + }, + "baseStats": { "hp": 45, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index 711ea31a24..de0baacce8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -8,6 +8,20 @@ "torrent", "h:protean" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:pearlescent_froglight", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:mystic_water", + "percentage": 20 + } + ] + }, "baseStats": { "hp": 72, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json index 4c6b1fdcf1..585f6e3359 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json @@ -9,6 +9,15 @@ "frisk", "h:harvest" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 43, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json index ebe67baaee..35c2dbf1f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json @@ -8,6 +8,16 @@ "compoundeyes", "h:friendguard" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + } + ] + }, + "baseStats": { "hp": 38, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json index 719f1a3eef..daecbfba12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json @@ -9,6 +9,16 @@ "poisontouch", "h:adaptability" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:kelp", + "percentage": 50 + } + ] + }, + "baseStats": { "hp": 50, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json index 20db728821..2c9c8c3f37 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json @@ -7,6 +7,17 @@ "shedskin", "h:friendguard" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:string", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 45, "attack": 22, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json index a6692e021b..bde75f2465 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json @@ -8,6 +8,24 @@ "flamebody", "h:galewings" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 5 + } + ] + }, + "baseStats": { "hp": 78, "attack": 81, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json index 351b35eb98..91e39f80f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json @@ -9,6 +9,16 @@ "frisk", "h:harvest" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 10 + } + ] + }, + "baseStats": { "hp": 85, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json index 0ce82d5237..3f932d14c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json @@ -9,6 +9,16 @@ "compoundeyes", "h:friendguard" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:silver_powder", + "percentage": 2.5 + } + ] + }, + "baseStats": { "hp": 80, "attack": 52, From 8188cabb4f3b35d5a57b529796e06909925af7ed Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 18:23:14 +0000 Subject: [PATCH 19/40] gen 7 drops --- .../cobblemon/species/generation7/bewear.json | 11 +++++++++++ .../cobblemon/species/generation7/bounsweet.json | 10 ++++++++++ .../species/generation7/crabominable.json | 10 ++++++++++ .../cobblemon/species/generation7/crabrawler.json | 10 ++++++++++ .../cobblemon/species/generation7/cutiefly.json | 9 +++++++++ .../cobblemon/species/generation7/komala.json | 10 ++++++++++ .../cobblemon/species/generation7/mudbray.json | 13 +++++++++++++ .../cobblemon/species/generation7/mudsdale.json | 15 +++++++++++++++ .../cobblemon/species/generation7/naganadel.json | 10 ++++++++++ .../cobblemon/species/generation7/ribombee.json | 14 ++++++++++++++ .../cobblemon/species/generation7/steenee.json | 10 ++++++++++ .../cobblemon/species/generation7/stufful.json | 9 +++++++++ .../cobblemon/species/generation7/tsareena.json | 10 ++++++++++ .../cobblemon/species/generation7/wishiwashi.json | 12 ++++++++++++ 14 files changed, 153 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json index 78136e18bb..ae0303db1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json @@ -9,6 +9,17 @@ "klutz", "h:unnerve" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chilan_berry", + "percentage": 5, + "quantityRange": "1-2" + } + ] + }, + "baseStats": { "hp": 120, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json index 5102349622..338a38945e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json @@ -8,6 +8,16 @@ "oblivious", "h:sweetveil" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 42, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json index 9c1a24cc66..f9222cd677 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json @@ -9,6 +9,16 @@ "ironfist", "h:angerpoint" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:pinap_berry", + "percentage": 10, + "quantityRange": "1-3" + } + ] + }, "baseStats": { "hp": 97, "attack": 132, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json index b42ce37795..8fbaa35504 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json @@ -8,6 +8,16 @@ "ironfist", "h:angerpoint" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:pinap_berry", + "percentage": 5, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 47, "attack": 82, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json index 04ccc0456d..adaec479c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json @@ -9,6 +9,15 @@ "shielddust", "h:sweetveil" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:honeycomb", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 40, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/komala.json b/common/src/main/resources/data/cobblemon/species/generation7/komala.json index a2e2c850de..a1efe382e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/komala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/komala.json @@ -1,10 +1,20 @@ { + "implemented": true, "name": "Komala", "nationalPokedexNumber": 775, "primaryType": "normal", "abilities": [ "comatose" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:prismarine_crystal", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 65, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json index 8ef7560fb3..f95f93df92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json @@ -8,6 +8,19 @@ "stamina", "h:innerfocus" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:leather", + "percentage": 50 + }, + { + "item": "minecraft:clay_ball", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 70, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json index 04e787ef86..8a925a89e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json @@ -8,6 +8,21 @@ "stamina", "h:innerfocus" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:leather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:clay_ball", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 100, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json index e770131f4c..43b172779a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json @@ -7,6 +7,16 @@ "abilities": [ "beastboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:echo_shard", + "percentage": 75, + "quantityRange": "1-3" + } + ] + }, "baseStats": { "hp": 73, "attack": 73, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json index 4a97afea74..ab429a70d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json @@ -9,6 +9,20 @@ "shielddust", "h:sweetveil" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:honeycomb", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:silver_powder", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json index cb7d6aecff..61e67aaa74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -8,6 +8,16 @@ "oblivious", "h:sweetveil" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 5, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 52, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json index e088290955..63fa4843ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json @@ -9,6 +9,15 @@ "klutz", "h:cutecharm" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chilan_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 70, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json index 7cc1bd91dc..161c10f694 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -8,6 +8,16 @@ "queenlymajesty", "h:sweetveil" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 10, + "quantityRange": "1-4" + } + ] + }, "baseStats": { "hp": 72, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json index 1ff8650331..9e81536e76 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json @@ -6,6 +6,18 @@ "abilities": [ "schooling" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:cod" + }, + { + "item": "minecraft:bone_meal", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 45, "attack": 20, From 9efc3f1eef402a0702079c5e37b66642ba17e123 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 18:47:53 +0000 Subject: [PATCH 20/40] gen 8 drops --- .../cobblemon/species/generation7/komala.json | 9 --------- .../cobblemon/species/generation8/arrokuda.json | 12 ++++++++++++ .../species/generation8/barraskewda.json | 12 ++++++++++++ .../cobblemon/species/generation8/boltund.json | 15 +++++++++++++++ .../species/generation8/corviknight.json | 17 +++++++++++++++++ .../species/generation8/corvisquire.json | 17 +++++++++++++++++ .../cobblemon/species/generation8/falinks.json | 9 +++++++++ .../cobblemon/species/generation8/nickit.json | 13 +++++++++++++ .../species/generation8/obstagoon.json | 10 ++++++++++ .../species/generation8/perrserker.json | 9 +++++++++ .../cobblemon/species/generation8/rookidee.json | 12 ++++++++++++ .../species/generation8/sirfetchd.json | 10 ++++++++++ .../cobblemon/species/generation8/thievul.json | 13 +++++++++++++ .../cobblemon/species/generation8/yamper.json | 13 +++++++++++++ 14 files changed, 162 insertions(+), 9 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation7/komala.json b/common/src/main/resources/data/cobblemon/species/generation7/komala.json index a1efe382e1..68da8bb58e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/komala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/komala.json @@ -6,15 +6,6 @@ "abilities": [ "comatose" ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:prismarine_crystal", - "percentage": 50 - } - ] - }, "baseStats": { "hp": 65, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json index 7e8ca57864..37b0675768 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json @@ -7,6 +7,18 @@ "swiftswim", "h:propellertail" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:salmon" + }, + { + "item": "minecraft:bone_meal", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 41, "attack": 63, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json index ff3ae99653..6c04858614 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json @@ -7,6 +7,18 @@ "swiftswim", "h:propellertail" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:salmon" + }, + { + "item": "minecraft:bone_meal", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 61, "attack": 123, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json index 4c4bf66274..cd4806ca82 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json @@ -7,6 +7,21 @@ "strongjaw", "h:competitive" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 69, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json index 65c49ce65d..cf4243b6d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json @@ -9,6 +9,23 @@ "unnerve", "h:mirrorarmor" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:metal_coat", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 98, "attack": 87, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json index 743b9e0412..56eddfcd48 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json @@ -8,6 +8,23 @@ "unnerve", "h:bigpecks" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 68, "attack": 67, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index f82d4847e3..b3e9f9df06 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json @@ -7,6 +7,15 @@ "battlearmor", "h:defiant" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:gold_helmet", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json index 7e10809723..b22ba41724 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json @@ -8,6 +8,19 @@ "unburden", "h:stakeout" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "2-3" + }, + { + "item": "minecraft:emerald", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 40, "attack": 28, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json index ffcdfc7dc2..627415965d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json @@ -9,6 +9,16 @@ "guts", "h:defiant" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chople_berry", + "percentage": 10, + "quantityRange": "1-3" + } + ] + }, "baseStats": { "hp": 93, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json index 9dd09e9464..ea901705aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -8,6 +8,15 @@ "toughclaws", "h:steelyspirit" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:razor_claw", + "percentage": 4 + } + ] + }, "baseStats": { "hp": 70, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json index 25e47ea06b..7a35edb5ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json @@ -8,6 +8,18 @@ "unnerve", "h:bigpecks" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + } + ] + }, "baseStats": { "hp": 38, "attack": 47, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index 89c00664df..db5edc12bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -7,6 +7,16 @@ "steadfast", "h:scrappy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:medicinal_leek", + "percentage": 20, + "quantityRange": "1-5" + } + ] + }, "baseStats": { "hp": 62, "attack": 135, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json index b6b562748b..9efec8b27c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json @@ -8,6 +8,19 @@ "unburden", "h:stakeout" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "3-5" + }, + { + "item": "minecraft:emerald", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 70, "attack": 58, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json index f45b670e51..f11667aafe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json @@ -7,6 +7,19 @@ "ballfetch", "h:rattled" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 59, "attack": 45, From f41c2aa0c1ea9f9f2130665fcf45a64bd476a388 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 3 Oct 2023 18:46:59 -0400 Subject: [PATCH 21/40] fixed 5 billion typos --- .../data/cobblemon/species/generation1/rattata.json | 3 +++ .../data/cobblemon/species/generation2/ampharos.json | 2 +- .../data/cobblemon/species/generation2/chinchou.json | 2 +- .../data/cobblemon/species/generation2/flaaffy.json | 2 +- .../data/cobblemon/species/generation2/hoothoot.json | 2 +- .../data/cobblemon/species/generation2/lanturn.json | 2 +- .../data/cobblemon/species/generation2/noctowl.json | 2 +- .../data/cobblemon/species/generation2/phanpy.json | 8 ++++++-- .../data/cobblemon/species/generation2/piloswine.json | 2 +- .../data/cobblemon/species/generation2/swinub.json | 2 +- .../data/cobblemon/species/generation3/pelipper.json | 2 +- .../data/cobblemon/species/generation3/swellow.json | 2 +- .../data/cobblemon/species/generation3/taillow.json | 2 +- .../data/cobblemon/species/generation3/wingull.json | 2 +- .../data/cobblemon/species/generation4/chatot.json | 2 +- .../data/cobblemon/species/generation4/combee.json | 2 +- .../data/cobblemon/species/generation4/floatzel.json | 2 +- .../data/cobblemon/species/generation4/mamoswine.json | 2 +- .../data/cobblemon/species/generation4/staraptor.json | 2 +- .../data/cobblemon/species/generation4/staravia.json | 2 +- .../data/cobblemon/species/generation4/starly.json | 2 +- .../data/cobblemon/species/generation4/vespiquen.json | 2 +- .../data/cobblemon/species/generation8/eiscue.json | 4 ++-- .../data/cobblemon/species/generation8/falinks.json | 2 +- .../data/cobblemon/species/generation9/tatsugiri.json | 2 +- 25 files changed, 33 insertions(+), 26 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json index 7695f52f49..49b0b67412 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json @@ -8,6 +8,9 @@ "guts", "h:hustle" ], + "drops": { + "amount": 3 + }, "baseStats": { "hp": 30, "attack": 56, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index 85db09ad1f..a10e6c0e0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -11,7 +11,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:raw_mutton", + "item": "minecraft:mutton", "quantityRange": "2-4", "percentage": 100 } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json index f50b483945..46aaf42920 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json @@ -13,7 +13,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:prismarine_crystal", + "item": "minecraft:prismarine_crystals", "percentage": 50 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json index eef18da09d..c5334d01f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json @@ -11,7 +11,7 @@ "amount": 2, "entries": [ { - "item": "minecraft:raw_mutton", + "item": "minecraft:mutton", "quantityRange": "1-3", "percentage": 100 }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json index 7a8f6930b5..074aa48681 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json @@ -17,7 +17,7 @@ "percentage": 50 }, { - "item": "minecraft:raw_chicken", + "item": "minecraft:chicken", "percentage": 100 }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json index 340ae979b9..ab725d821a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json @@ -13,7 +13,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:prismarine_crystal", + "item": "minecraft:prismarine_crystals", "quantityRange": "1-2", "percentage": 66 } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json index 63ab4a69c9..96184c503c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json @@ -18,7 +18,7 @@ "percentage": 66 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:wise_glasses", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json index c7bc50a597..00ec605cf7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json @@ -8,11 +8,15 @@ "h:sandveil" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:prismarine_crystal", + "item": "minecraft:clay_ball", "percentage": 50 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json index a01e0f75f6..eb98471318 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json @@ -38,7 +38,7 @@ "amount": "2", "entries": [ { - "item": "minecraft:raw_porkchop", + "item": "minecraft:porkchop", "quantityRange": "1-2" }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json index c1f942b686..22d4738eae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json @@ -38,7 +38,7 @@ "amount": "2", "entries": [ { - "item": "minecraft:raw_porkchop" + "item": "minecraft:porkchop" }, { "item": "minecraft:brown_wool" diff --git a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json index 8581c59df1..38204c0b4a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json @@ -18,7 +18,7 @@ "percentage": 66 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:wacan_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index 7953bfc41a..457c6837f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json @@ -17,7 +17,7 @@ "percentage": 66 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:sharp_beak", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json index 9dd94b2a29..54aa87dbca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json @@ -16,7 +16,7 @@ "percentage": 50 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:charti_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json index ed8639d837..daaead3690 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json @@ -17,7 +17,7 @@ "percentage": 50 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:wacan_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json index ccd50bedde..320989a708 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json @@ -18,7 +18,7 @@ "percentage": 66 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/combee.json b/common/src/main/resources/data/cobblemon/species/generation4/combee.json index eccdba05b1..48df85ed55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/combee.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/combee.json @@ -12,7 +12,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:honey_comb", + "item": "minecraft:honeycomb", "percentage": 50 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json index 0594ca1ee1..99772bc4fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json @@ -11,7 +11,7 @@ "amount": 2, "entries": [ { - "item": "minecraft:raw_salmon", + "item": "minecraft:salmon", "quantityRange": "1-2", "percentage": 66 }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index 8110117c7c..db7f1640d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -38,7 +38,7 @@ "amount": "2", "entries": [ { - "item": "minecraft:raw_porkchop", + "item": "minecraft:porkchop", "quantityRange": "2-3" }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json index 8086b6878b..7ba592abbd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json @@ -17,7 +17,7 @@ "percentage": 75 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:sharp_beak", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json index 5c30e7dd39..68a249ad42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json @@ -17,7 +17,7 @@ "percentage": 66 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:sharp_beak", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/starly.json b/common/src/main/resources/data/cobblemon/species/generation4/starly.json index 66779053d6..2803b1c7a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/starly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/starly.json @@ -16,7 +16,7 @@ "percentage": 50 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { "item": "cobblemon:yache_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json index 1c228fa1d8..cd2bfd2700 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json @@ -12,7 +12,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:honey_comb", + "item": "minecraft:honeycomb", "quantityRange": "1-3", "percentage": 75 } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index d008e2a276..db45c5e138 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -41,10 +41,10 @@ "percentage": 50 }, { - "item": "minecraft:raw_chicken" + "item": "minecraft:chicken" }, { - "item": "minecraft:raw_cod", + "item": "minecraft:cod", "percentage": 50 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index b3e9f9df06..7829e3b2c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json @@ -11,7 +11,7 @@ "amount": 1, "entries": [ { - "item": "minecraft:gold_helmet", + "item": "minecraft:golden_helmet", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index 765689f874..50a82ba6eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -46,7 +46,7 @@ "amount": "2", "entries": [ { - "item": "minecraft:raw_salmon" + "item": "minecraft:salmon" }, { "item": "minecraft:bone_meal", From ae8e4a4f3a44769ad7b86e82ddcb79552d36bc97 Mon Sep 17 00:00:00 2001 From: Lily Date: Fri, 6 Oct 2023 22:03:52 -0400 Subject: [PATCH 22/40] gen 1 drops updated --- .../species/generation1/aerodactyl.json | 2 +- .../cobblemon/species/generation1/arbok.json | 6 ++++- .../species/generation1/arcanine.json | 6 ++++- .../species/generation1/articuno.json | 15 ++++++++++++ .../species/generation1/beedrill.json | 2 +- .../species/generation1/bellsprout.json | 4 ++-- .../species/generation1/blastoise.json | 2 +- .../species/generation1/butterfree.json | 2 +- .../species/generation1/chansey.json | 2 +- .../species/generation1/charizard.json | 2 +- .../species/generation1/clefable.json | 6 ++++- .../species/generation1/clefairy.json | 6 ++++- .../species/generation1/cloyster.json | 9 +++++++ .../species/generation1/dewgong.json | 10 +++++++- .../species/generation1/diglett.json | 8 +++++-- .../cobblemon/species/generation1/ditto.json | 13 ++++++++++ .../species/generation1/dragonair.json | 10 +++++++- .../species/generation1/dragonite.json | 10 +++++++- .../species/generation1/dratini.json | 10 +++++++- .../species/generation1/drowzee.json | 9 +++++++ .../species/generation1/dugtrio.json | 9 ++++--- .../cobblemon/species/generation1/ekans.json | 6 ++++- .../species/generation1/electabuzz.json | 7 ++++-- .../species/generation1/exeggcute.json | 10 +++++++- .../species/generation1/exeggutor.json | 10 +++++++- .../species/generation1/farfetchd.json | 6 ++++- .../cobblemon/species/generation1/fearow.json | 6 ++++- .../species/generation1/flareon.json | 13 ++++++++++ .../cobblemon/species/generation1/gastly.json | 13 ++++++++++ .../cobblemon/species/generation1/gengar.json | 13 ++++++++++ .../species/generation1/geodude.json | 6 ++++- .../cobblemon/species/generation1/gloom.json | 9 +++++++ .../cobblemon/species/generation1/golbat.json | 13 ++++++++++ .../species/generation1/goldeen.json | 10 +++++++- .../species/generation1/golduck.json | 6 ++++- .../cobblemon/species/generation1/golem.json | 6 ++++- .../species/generation1/graveler.json | 6 ++++- .../species/generation1/growlithe.json | 6 ++++- .../species/generation1/gyarados.json | 6 ++++- .../species/generation1/haunter.json | 13 ++++++++++ .../cobblemon/species/generation1/hypno.json | 9 +++++++ .../species/generation1/jigglypuff.json | 9 +++++++ .../species/generation1/jolteon.json | 13 ++++++++++ .../cobblemon/species/generation1/jynx.json | 9 +++++++ .../species/generation1/kangaskhan.json | 9 +++++++ .../species/generation1/koffing.json | 6 ++++- .../cobblemon/species/generation1/lapras.json | 16 +++++++++---- .../species/generation1/machamp.json | 6 ++++- .../species/generation1/machoke.json | 6 ++++- .../cobblemon/species/generation1/machop.json | 6 ++++- .../species/generation1/magikarp.json | 6 ++++- .../cobblemon/species/generation1/magmar.json | 6 ++++- .../species/generation1/magnemite.json | 10 +++++++- .../species/generation1/magneton.json | 2 +- .../cobblemon/species/generation1/mankey.json | 6 ++++- .../cobblemon/species/generation1/meowth.json | 3 +-- .../cobblemon/species/generation1/mewtwo.json | 8 +++++++ .../species/generation1/nidoking.json | 6 ++++- .../species/generation1/nidoqueen.json | 6 ++++- .../species/generation1/nidoranf.json | 6 ++++- .../species/generation1/nidoranm.json | 6 ++++- .../species/generation1/nidorina.json | 6 ++++- .../species/generation1/nidorino.json | 6 ++++- .../species/generation1/ninetales.json | 6 ++++- .../cobblemon/species/generation1/oddish.json | 9 +++++++ .../cobblemon/species/generation1/onix.json | 10 +++++++- .../cobblemon/species/generation1/paras.json | 6 ++++- .../species/generation1/parasect.json | 6 ++++- .../species/generation1/persian.json | 7 +++--- .../species/generation1/pikachu.json | 9 +++++++ .../species/generation1/poliwag.json | 9 +++++++ .../species/generation1/poliwhirl.json | 9 +++++++ .../species/generation1/poliwrath.json | 9 +++++++ .../cobblemon/species/generation1/ponyta.json | 6 ++++- .../species/generation1/primeape.json | 6 ++++- .../species/generation1/psyduck.json | 6 ++++- .../cobblemon/species/generation1/raichu.json | 18 ++++++++++++++ .../species/generation1/rapidash.json | 10 +++++--- .../species/generation1/raticate.json | 24 +++++++++++++++++++ .../species/generation1/rattata.json | 21 +++++++++++++++- .../cobblemon/species/generation1/rhydon.json | 4 ++++ .../species/generation1/rhyhorn.json | 4 ++++ .../species/generation1/sandshrew.json | 13 ++++++++++ .../species/generation1/sandslash.json | 13 ++++++++++ .../species/generation1/seaking.json | 10 +++++++- .../cobblemon/species/generation1/seel.json | 10 +++++++- .../species/generation1/shellder.json | 9 +++++++ .../species/generation1/slowbro.json | 13 ++++++++++ .../species/generation1/slowpoke.json | 13 ++++++++++ .../species/generation1/spearow.json | 6 ++++- .../species/generation1/starmie.json | 9 +++++++ .../cobblemon/species/generation1/staryu.json | 13 ++++++++++ .../species/generation1/tentacool.json | 15 ++++++++---- .../species/generation1/tentacruel.json | 15 ++++++++---- .../species/generation1/vaporeon.json | 13 ++++++++++ .../species/generation1/venomoth.json | 7 +++++- .../species/generation1/venonat.json | 9 +++++++ .../species/generation1/venusaur.json | 2 +- .../species/generation1/vileplume.json | 9 +++++++ .../cobblemon/species/generation1/vulpix.json | 6 ++++- .../species/generation1/weezing.json | 6 ++++- .../species/generation1/wigglytuff.json | 9 +++++++ .../cobblemon/species/generation1/zapdos.json | 15 ++++++++++++ .../cobblemon/species/generation1/zubat.json | 13 ++++++++++ .../cobblemon/species/generation2/elekid.json | 7 ++++-- .../cobblemon/species/generation2/espeon.json | 13 ++++++++++ .../species/generation2/igglybuff.json | 13 ++++++++++ .../cobblemon/species/generation2/magby.json | 6 ++++- .../cobblemon/species/generation2/pichu.json | 13 ++++++++++ .../species/generation2/slowking.json | 13 ++++++++++ .../species/generation2/smoochum.json | 9 +++++++ .../species/generation2/steelix.json | 11 +++++---- .../species/generation2/umbreon.json | 13 ++++++++++ .../species/generation4/electivire.json | 7 ++++-- .../species/generation4/glaceon.json | 13 ++++++++++ .../species/generation4/happiny.json | 2 +- .../species/generation4/leafeon.json | 13 ++++++++++ .../species/generation4/magmortar.json | 6 ++++- .../species/generation4/magnezone.json | 10 +++++++- .../species/generation4/munchlax.json | 13 +++++++--- .../species/generation4/rhyperior.json | 6 ++++- .../species/generation6/sylveon.json | 9 +++++++ 122 files changed, 955 insertions(+), 103 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json index 5a727168f1..85db88e373 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json @@ -99,7 +99,7 @@ }, { "item": "cobblemon:rocky_helmet", - "percentage": 5 + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json index e8aa0e5e6a..d067839371 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json @@ -39,11 +39,15 @@ "dragon" ], "drops": { - "amount": "1", + "amount": "2", "entries": [ { "item": "cobblemon:razor_fang", "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json index 43a9a9a695..d769d0e0fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json @@ -144,12 +144,16 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:bone", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json index 7edd3306db..425e1ca0f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json @@ -8,6 +8,21 @@ "pressure", "h:snowcloak" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "2-4" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:never_melt_ice" + } + ] + }, "baseStats": { "hp": 90, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json index e82fc0a46a..4d3dd44b36 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json @@ -95,7 +95,7 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 2.5 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json index 9bc768fd95..12894d6903 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json @@ -29,8 +29,8 @@ "amount": "1", "entries": [ { - "item": "cobblemon:big_root", - "percentage": 2.5 + "item": "cobblemon:pecha_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index e30f27ace6..7a39ed8b70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -128,7 +128,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json index 6c0cdf7750..ca3e39d9b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json @@ -99,7 +99,7 @@ "entries": [ { "item": "cobblemon:silver_powder", - "percentage": 2.5 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json index c30668b58a..ee11398fca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json @@ -26,7 +26,7 @@ "fairy" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:lucky_egg", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index 0e198bbc84..74f529e1e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -177,7 +177,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json index 08be1e3f48..8ce8a19649 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json @@ -34,11 +34,15 @@ "fairy" ], "drops": { - "amount": "1", + "amount": "2", "entries": [ { "item": "cobblemon:moon_stone", "percentage": 10 + }, + { + "item": "cobblemon:leppa_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json index 88b83bad1a..dbef7136ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json @@ -34,11 +34,15 @@ "fairy" ], "drops": { - "amount": "1", + "amount": "2", "entries": [ { "item": "cobblemon:moon_stone", "percentage": 5 + }, + { + "item": "cobblemon:leppa_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json index 0c5d10eb97..60d8d07170 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json @@ -9,6 +9,15 @@ "skilllink", "h:overcoat" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:aspear_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 50, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json index 7a46310a3c..91ce635550 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json @@ -36,12 +36,20 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:cod", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json index b2305cf064..20ba858295 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json @@ -219,15 +219,19 @@ "field" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:potato", - "percentage": 50 + "percentage": 2.5 }, { "item": "cobblemon:big_root", "percentage": 2.5 + }, + { + "item": "cobblemon:soft_sand", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json index 74928b06ce..b9a3c6781e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json @@ -7,6 +7,19 @@ "limber", "h:imposter" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:quick_powder", + "percentage": 50 + }, + { + "item": "cobblemon:metal_powder", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 48, "attack": 48, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json index 793bcad75a..1977c22264 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json @@ -38,7 +38,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:dragon_breath", @@ -48,6 +48,14 @@ { "item": "cobblemon:dragon_scale", "percentage": 5 + }, + { + "item": "cobblemon:dragon_fang", + "percentage": 5 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json index 08105023c4..5618632e28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json @@ -38,7 +38,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:dragon_breath", @@ -48,6 +48,14 @@ { "item": "cobblemon:dragon_scale", "percentage": 10 + }, + { + "item": "cobblemon:dragon_fang", + "percentage": 10 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dratini.json b/common/src/main/resources/data/cobblemon/species/generation1/dratini.json index 1ffc4b2107..8e4d1429a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dratini.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dratini.json @@ -34,7 +34,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:dragon_breath", @@ -43,6 +43,14 @@ { "item": "cobblemon:dragon_scale", "percentage": 2.5 + }, + { + "item": "cobblemon:dragon_fang", + "percentage": 2.5 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json b/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json index 936e199078..9bfa4b8ad2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json @@ -8,6 +8,15 @@ "forewarn", "h:innerfocus" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 48, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json index 48770a1b4a..66cf9d308c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -201,16 +201,19 @@ "field" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:potato", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 5 }, { "item": "cobblemon:big_root", "percentage": 5 + }, + { + "item": "cobblemon:soft_sand", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json index a5d662d21e..4c36143749 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json @@ -38,11 +38,15 @@ "dragon" ], "drops": { - "amount": "1", + "amount": "2", "entries": [ { "item": "cobblemon:razor_fang", "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json index 491fe79233..0df522415c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json @@ -25,7 +25,7 @@ "human_like" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:redstone", @@ -34,7 +34,10 @@ }, { "item": "cobblemon:electirizer", - "quantityRange": "1", + "percentage": 5 + }, + { + "item": "cobblemon:cheri_berry", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json index 80dfbd5f32..96c9bb1469 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json @@ -104,12 +104,20 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:egg", "quantityRange": "1-3", "percentage": 75 + }, + { + "item": "cobblemon:oval_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json index 9955f9ec84..dd046caf27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json @@ -229,12 +229,20 @@ "grass" ], "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:egg", "quantityRange": "1-3", "percentage": 75 + }, + { + "item": "cobblemon:oval_stone", + "percentage": 5 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json index 776e3777b4..fb6016f630 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json @@ -165,7 +165,7 @@ } }, "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:feather", @@ -173,6 +173,10 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:medicinal_leek", + "percentage": 50 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json index 1627014850..2f4ec32bcb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json @@ -42,7 +42,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -55,6 +55,10 @@ { "item": "cobblemon:sharp_beak", "percentage": 5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json index af5c787173..5d18f3fbd1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json @@ -7,6 +7,19 @@ "flashfire", "h:guts" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:fire_stone", + "percentage": 25 + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 65, "attack": 130, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gastly.json b/common/src/main/resources/data/cobblemon/species/generation1/gastly.json index b9503816ce..a6780c608e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gastly.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gastly.json @@ -7,6 +7,19 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 30, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json index f68bfa0357..ca692fa9e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json @@ -7,6 +7,19 @@ "abilities": [ "cursedbody" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 10 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 60, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json index 4084205471..af287103e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json @@ -189,7 +189,7 @@ "mineral" ], "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:flint", @@ -202,6 +202,10 @@ { "item": "cobblemon:black_augurite", "percentage": 2.5 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json index 73c2d12dd0..d350228415 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json @@ -8,6 +8,15 @@ "chlorophyll", "h:stench" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:bluk_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json index caa0dcd2a5..d43953ebe9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json @@ -8,6 +8,19 @@ "innerfocus", "h:infiltrator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:razor_fang", + "percentage": 5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json index 6f2b71ef78..810514266d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json @@ -39,7 +39,7 @@ "water_2" ], "drops": { - "amount": "1", + "amount": 4, "entries": [ { "item": "minecraft:salmon" @@ -47,6 +47,14 @@ { "item": "minecraft:bone_meal", "percentage": 5 + }, + { + "item": "cobblemon:mystic_water", + "percentage": 2.5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json index aeb6616190..a43e171f58 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json @@ -42,7 +42,7 @@ } }, "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -55,6 +55,10 @@ { "item": "cobblemon:mystic_water", "percentage": 5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index 159b63c063..b3e8fcd448 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -179,7 +179,7 @@ "mineral" ], "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:flint", @@ -193,6 +193,10 @@ { "item": "cobblemon:black_augurite", "percentage": 10 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json index 6eed698c7b..34a016bd6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -178,7 +178,7 @@ "mineral" ], "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:flint", @@ -192,6 +192,10 @@ { "item": "cobblemon:black_augurite", "percentage": 5 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json index 9cb28642c3..c69bb90f36 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json @@ -147,11 +147,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:bone", "percentage": 50 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json index 1397cecead..941b888f19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json @@ -92,7 +92,7 @@ } }, "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:salmon" @@ -100,6 +100,10 @@ { "item": "minecraft:bone_meal", "percentage": 10 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json index 1dd02b8d46..f694429618 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json @@ -7,6 +7,19 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 45, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json index b3e7b66c19..6dc7433f1b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json @@ -8,6 +8,15 @@ "forewarn", "h:innerfocus" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 85, "attack": 73, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json index 9fbc9fc733..782b77027f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json @@ -9,6 +9,15 @@ "competitive", "h:friendguard" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 115, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json index a3c7598b2f..958b9995a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json @@ -7,6 +7,19 @@ "voltabsorb", "h:quickfeet" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:thunder_stone", + "percentage": 25 + }, + { + "item": "cobblemon:magnet", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 65, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json index e22e6b48c2..b162d0d9d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json @@ -9,6 +9,15 @@ "forewarn", "h:dryskin" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:aspear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json index 318cb817f8..338a3a977a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json @@ -8,6 +8,15 @@ "scrappy", "h:innerfocus" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 105, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json index e0c8d1ea4b..e638c8f6d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json @@ -33,11 +33,15 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:black_sludge", "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json index 0d274b0c98..5cb5a94401 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json @@ -88,15 +88,23 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { - "item": "cobblemon:nevermelt_ice", - "percentage": 20 + "item": "cobblemon:mystic_water", + "percentage": 5 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 5 }, { "item": "minecraft:heart_of_the_sea", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json index dac9d52b6c..b3f894e8c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json @@ -74,11 +74,15 @@ "human_like" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 10 + }, + { + "item": "cobblemon:focus_band", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json index f809d90009..25bc9a31ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json @@ -26,11 +26,15 @@ "human_like" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 5 + }, + { + "item": "cobblemon:focus_band", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machop.json b/common/src/main/resources/data/cobblemon/species/generation1/machop.json index 93cbeed431..1f3f3efceb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machop.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machop.json @@ -26,11 +26,15 @@ "human_like" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 2.5 + }, + { + "item": "cobblemon:focus_band", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json index 752e2cd7be..6b46d2ac2a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json @@ -39,7 +39,7 @@ } }, "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:salmon" @@ -47,6 +47,10 @@ { "item": "minecraft:bone_meal", "percentage": 5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json index ed184b39fd..83cac015f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json @@ -25,7 +25,7 @@ "human_like" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:blaze_powder", @@ -34,6 +34,10 @@ { "item": "cobblemon:magmarizer", "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json b/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json index e1dc33ffea..a483b89eed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:raw_iron", @@ -52,6 +52,14 @@ { "item": "cobblemon:magnet", "percentage": 2.5 + }, + { + "item": "cobblemon:metal_coat", + "percentage": 2.5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json index a204c1c809..99dfab0d27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:raw_iron", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mankey.json b/common/src/main/resources/data/cobblemon/species/generation1/mankey.json index 53399dc96e..f1f04638a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mankey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mankey.json @@ -34,11 +34,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 2.5 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json index 1aded5fd35..8cb9b1b8ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json @@ -442,8 +442,7 @@ "entries": [ { "item": "minecraft:gold_nugget", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 50 }, { "item": "cobblemon:quick_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json index 59727643dc..5efab2df14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json @@ -7,6 +7,14 @@ "pressure", "h:unnerve" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:twisted_spoon" + } + ] + }, "baseStats": { "hp": 106, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json index 7e76e7f3b1..bddc9fc6da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json @@ -36,11 +36,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 10 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json index bff00d7a32..1bb42010ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json @@ -35,11 +35,15 @@ "undiscovered" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 10 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json index f72a0c7d90..9f759e9839 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json @@ -35,11 +35,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json index f21e619351..c0be64a226 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json @@ -35,11 +35,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json index 2679b237c6..80f3463832 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json @@ -34,11 +34,15 @@ "undiscovered" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json index 57caf4e525..ae027f72b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json @@ -35,11 +35,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json index cdb1cc3198..9c2932e69f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json @@ -194,11 +194,15 @@ "field" ], "drops": { - "amount": "1", + "amount": "2", "entries": [ { "item": "minecraft:sweet_berries", "quantityRange": "3-5" + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/oddish.json b/common/src/main/resources/data/cobblemon/species/generation1/oddish.json index e011567a8f..18a6df2658 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/oddish.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/oddish.json @@ -8,6 +8,15 @@ "chlorophyll", "h:runaway" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:bluk_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/onix.json b/common/src/main/resources/data/cobblemon/species/generation1/onix.json index f986464933..8e503763f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/onix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/onix.json @@ -38,12 +38,20 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:flint", "quantityRange": "1-3", "percentage": 75 + }, + { + "item": "cobblemon:hard_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/paras.json b/common/src/main/resources/data/cobblemon/species/generation1/paras.json index 6b524f89c9..0ba85ab5ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/paras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/paras.json @@ -36,12 +36,16 @@ "grass" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:red_mushroom", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:coba_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json index b57ebcecca..88f622af4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json @@ -43,10 +43,14 @@ "grass" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:red_mushroom" + }, + { + "item": "cobblemon:coba_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/persian.json b/common/src/main/resources/data/cobblemon/species/generation1/persian.json index 727096f7a9..560813a861 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/persian.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/persian.json @@ -226,11 +226,12 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { - "item": "minecraft:raw_gold", - "percentage": 20 + "item": "minecraft:gold_nugget", + "percentage": 66, + "quantityRange": "1-2" }, { "item": "cobblemon:quick_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index eda3c0dcec..bbfd90a50b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -7,6 +7,15 @@ "static", "h:lightningrod" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 35, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json index b785a1d2cd..8c21ca383a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json @@ -8,6 +8,15 @@ "damp", "h:swiftswim" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json index 41b2bb5986..95135bda8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json @@ -8,6 +8,15 @@ "damp", "h:swiftswim" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:wacan_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json index b730d14a0b..8afb44558f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json @@ -9,6 +9,15 @@ "damp", "h:swiftswim" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:wacan_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 90, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json index 6344d76e22..7230deda4b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json @@ -154,7 +154,7 @@ } }, "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:leather", @@ -163,6 +163,10 @@ { "item": "minecraft:blaze_powder", "percentage": 2.5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json index f0ae45a79a..b474b82601 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json @@ -34,11 +34,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 5 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json b/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json index dff36dbf66..620e8cca9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json @@ -41,7 +41,7 @@ } }, "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -53,6 +53,10 @@ { "item": "cobblemon:mystic_water", "percentage": 2.5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json index 66374cd01c..f8676d9b65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json @@ -7,6 +7,15 @@ "static", "h:lightningrod" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 60, "attack": 90, @@ -37,6 +46,15 @@ "abilities": [ "surgesurfer" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 60, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json index 60721d85c3..08305a3c1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json @@ -151,16 +151,20 @@ } }, "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:leather", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 66, + "quantityRange": "1-2" }, { "item": "minecraft:blaze_powder", "percentage": 5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json index f0b3d1b46c..512a481c51 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json @@ -8,6 +8,20 @@ "guts", "h:hustle" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 5 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 55, "attack": 81, @@ -45,6 +59,16 @@ "hustle", "h:thickfat" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:rotten_flesh", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 75, "attack": 71, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json index 49b0b67412..c0bab978f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json @@ -9,7 +9,17 @@ "h:hustle" ], "drops": { - "amount": 3 + "amount": 2, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + } + ] }, "baseStats": { "hp": 30, @@ -48,6 +58,15 @@ "hustle", "h:thickfat" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 30, "attack": 56, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json index 4f25c1bb74..4a84578158 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json @@ -33,6 +33,10 @@ { "item": "cobblemon:protector", "percentage": 5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json index fef0262bbf..1547d1331e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json @@ -33,6 +33,10 @@ { "item": "cobblemon:protector", "percentage": 2.5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json index d998049614..7fa463b99e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json @@ -7,6 +7,19 @@ "sandveil", "h:sandrush" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:quick_claw", + "percentage": 2.5 + }, + { + "item": "cobblemon:soft_sand", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json index 2866635837..6a0f69523d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -7,6 +7,19 @@ "sandveil", "h:sandrush" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:quick_claw", + "percentage": 5 + }, + { + "item": "cobblemon:soft_sand", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json index 6a42aa2e16..38b4207fb2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json @@ -39,7 +39,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:salmon" @@ -47,6 +47,14 @@ { "item": "minecraft:bone_meal", "percentage": 10 + }, + { + "item": "cobblemon:mystic_water", + "percentage": 5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seel.json b/common/src/main/resources/data/cobblemon/species/generation1/seel.json index d37ae8b782..eacf46d179 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seel.json @@ -35,11 +35,19 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:cod", "percentage": 50 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 2.5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/shellder.json b/common/src/main/resources/data/cobblemon/species/generation1/shellder.json index a35386c7d3..9b765bc683 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/shellder.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/shellder.json @@ -8,6 +8,15 @@ "skilllink", "h:overcoat" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 30, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json index 3e4dc6de8a..9db01124f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json @@ -9,6 +9,19 @@ "owntempo", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 + }, + { + "item": "cobblemon:kings_rock", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 95, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json index 890a8e76b5..97d88112ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json @@ -9,6 +9,19 @@ "owntempo", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 + }, + { + "item": "cobblemon:kings_rock", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 90, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/spearow.json b/common/src/main/resources/data/cobblemon/species/generation1/spearow.json index 1b40394d14..0ed4750f10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/spearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/spearow.json @@ -39,7 +39,7 @@ } }, "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -51,6 +51,10 @@ { "item": "cobblemon:sharp_beak", "percentage": 2.5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/starmie.json b/common/src/main/resources/data/cobblemon/species/generation1/starmie.json index 59d39388f0..c2f046e18d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/starmie.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/starmie.json @@ -9,6 +9,15 @@ "naturalcure", "h:analytic" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:persim_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/staryu.json b/common/src/main/resources/data/cobblemon/species/generation1/staryu.json index da459dad0d..8584ca2060 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/staryu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/staryu.json @@ -8,6 +8,19 @@ "naturalcure", "h:analytic" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 30, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json index 0c497df94f..67d18d9381 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json @@ -45,11 +45,12 @@ "light": "0-4" }, "drops": { - "amount": "1", + "amount": 4, "entries": [ { - "item": "cobblemon:poison_barb", - "percentage": 2.5 + "item": "cobblemon:ink_sac", + "quantityRange": "1-3", + "percentage": 10 }, { "item": "minecraft:glow_ink_sac", @@ -57,8 +58,12 @@ "percentage": 10 }, { - "item": "minecraft:ink_sac", - "quantityRange": "1-3" + "item": "cobblemon:poison_barb", + "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json index 231ef1920a..2123d40d19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json @@ -45,11 +45,12 @@ "light": "0-4" }, "drops": { - "amount": "1", + "amount": 4, "entries": [ { - "item": "cobblemon:poison_barb", - "percentage": 5 + "item": "cobblemon:ink_sac", + "quantityRange": "2-4", + "percentage": 10 }, { "item": "minecraft:glow_ink_sac", @@ -57,8 +58,12 @@ "percentage": 10 }, { - "item": "minecraft:ink_sac", - "quantityRange": "2-4" + "item": "cobblemon:poison_barb", + "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json index e26bc7d1a7..8a7456c674 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json @@ -7,6 +7,19 @@ "waterabsorb", "h:hydration" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:water_stone", + "percentage": 25 + }, + { + "item": "cobblemon:mystic_water", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 130, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json index 5c8842116d..ed7c6d113c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json @@ -43,8 +43,13 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ + { + "item": "minecraft:string", + "percentage": 66, + "quantityRange": "1-2" + }, { "item": "cobblemon:silver_powder", "percentage": 2.5 diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venonat.json b/common/src/main/resources/data/cobblemon/species/generation1/venonat.json index 49e908e8a7..a78535733b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venonat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venonat.json @@ -9,6 +9,15 @@ "tintedlens", "h:runaway" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 60, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index 051787a954..5a5692958d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -143,7 +143,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json index 4a7c7814e6..dc528e51c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json @@ -8,6 +8,15 @@ "chlorophyll", "h:effectspore" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:bluk_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 75, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json index fb416926f5..86fe9c6196 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json @@ -212,11 +212,15 @@ "field" ], "drops": { - "amount": "1", + "amount": "2", "entries": [ { "item": "minecraft:sweet_berries", "quantityRange": "2-3" + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json index 81035c9eaa..a12f1e6d33 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json @@ -152,11 +152,15 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:black_sludge", "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json index 30f1cc8a6f..073a1a0f70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json @@ -9,6 +9,15 @@ "competitive", "h:frisk" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 140, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json index 6186749325..71f4a75542 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json @@ -8,6 +8,21 @@ "pressure", "h:static" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:feather", + "quantityRange": "2-4" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:magnet" + } + ] + }, "baseStats": { "hp": 90, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zubat.json b/common/src/main/resources/data/cobblemon/species/generation1/zubat.json index 6f17865fae..7e6edafaf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zubat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zubat.json @@ -8,6 +8,19 @@ "innerfocus", "h:infiltrator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:razor_fang", + "percentage": 2.5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/elekid.json b/common/src/main/resources/data/cobblemon/species/generation2/elekid.json index 00b7d9b70d..bbcfe6b613 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/elekid.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/elekid.json @@ -25,7 +25,7 @@ "undiscovered" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:redstone", @@ -33,7 +33,10 @@ }, { "item": "cobblemon:electirizer", - "quantityRange": "1", + "percentage": 2.5 + }, + { + "item": "cobblemon:cheri_berry", "percentage": 2.5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json index 68dfbad1fd..826ab708e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json @@ -15,6 +15,19 @@ "special_defence": 95, "speed": 110 }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:sun_stone", + "percentage": 25 + }, + { + "item": "cobblemon:twisted_spoon", + "percentage": 10 + } + ] + }, "catchRate": 45, "maleRatio": 0.875, "shoulderMountable": false, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json index 9e81c3c8c5..8e1e28436b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json @@ -9,6 +9,19 @@ "competitive", "h:friendguard" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:moon_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 90, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magby.json b/common/src/main/resources/data/cobblemon/species/generation2/magby.json index 765c1fba45..8ff68bbc05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magby.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magby.json @@ -25,7 +25,7 @@ "undiscovered" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:blaze_powder", @@ -34,6 +34,10 @@ { "item": "cobblemon:magmarizer", "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json index a09773d5a8..0f936a8bce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json @@ -7,6 +7,19 @@ "static", "h:lightningrod" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:thunder_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 20, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json index c1a3d6e9f3..98f1c4f8a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json @@ -9,6 +9,19 @@ "owntempo", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:kings_rock", + "percentage": 10 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 95, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json index 6f07dc9e69..38a4128944 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json @@ -9,6 +9,15 @@ "forewarn", "h:hydration" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json index 198a9eb2e4..dc8a9dcd1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json @@ -74,16 +74,19 @@ "mineral" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:raw_iron", - "quantityRange": "1-3", - "percentage": 75 + "quantityRange": "2-4" }, { "item": "cobblemon:metal_coat", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json index 6f2a789d37..8801da33dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json @@ -7,6 +7,19 @@ "synchronize", "h:innerfocus" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:moon_stone", + "percentage": 25 + }, + { + "item": "cobblemon:black_glasses", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 95, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json index 9308826fb8..406dd604d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json @@ -25,7 +25,7 @@ "human_like" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:redstone", @@ -34,7 +34,10 @@ }, { "item": "cobblemon:electirizer", - "quantityRange": "1", + "percentage": 10 + }, + { + "item": "cobblemon:cheri_berry", "percentage": 10 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json index bc48a4f003..9053a7dc69 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json @@ -7,6 +7,19 @@ "snowcloak", "h:icebody" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:ice_stone", + "percentage": 25 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 65, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json index ea56377651..8f0a75ca9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json @@ -30,7 +30,7 @@ "entries": [ { "item": "cobblemon:oval_stone", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json index df5200f052..008200addd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json @@ -7,6 +7,19 @@ "leafguard", "h:chlorophyll" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:leaf_stone", + "percentage": 25 + }, + { + "item": "cobblemon:miracle_seed", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 65, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json index 671d701506..cb18882c8c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -25,7 +25,7 @@ "human_like" ], "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:blaze_powder", @@ -34,6 +34,10 @@ { "item": "cobblemon:magmarizer", "percentage": 10 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json index 178c903a97..f04cdb4420 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json @@ -37,7 +37,7 @@ } }, "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:raw_iron", @@ -47,6 +47,14 @@ { "item": "cobblemon:magnet", "percentage": 10 + }, + { + "item": "cobblemon:metal_coat", + "percentage": 10 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json index 9c68bc88bb..06eb4043a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json @@ -26,13 +26,20 @@ "undiscovered" ], "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:apple", "quantityRange": "1-3", - "percentage": 75, - "maxSelectableTimes": 2 + "percentage": 75 + }, + { + "item": "cobblemon:leftovers", + "percentage": 2.5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json index defafa4a7b..67b5f77c86 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json @@ -28,11 +28,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:protector", "percentage": 10 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json index 5203aa40fd..32353f6e75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json @@ -7,6 +7,15 @@ "cutecharm", "h:pixilate" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:shiny_stone", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 95, "attack": 65, From 5b6ed359a3c4faea115b5273a3667b704b0441a4 Mon Sep 17 00:00:00 2001 From: Lily Date: Sat, 7 Oct 2023 18:59:12 -0400 Subject: [PATCH 23/40] gen 1, 2, 3, and 7 drops (i spent 4 hours on this :3) --- .../cobblemon/species/generation1/abra.json | 6 +++++- .../species/generation1/aerodactyl.json | 2 +- .../species/generation1/alakazam.json | 6 +++++- .../cobblemon/species/generation1/arbok.json | 6 +----- .../species/generation1/beedrill.json | 6 +++++- .../species/generation1/bellsprout.json | 8 +++++-- .../species/generation1/blastoise.json | 2 +- .../species/generation1/butterfree.json | 6 +++++- .../species/generation1/caterpie.json | 6 +++++- .../species/generation1/charizard.json | 2 +- .../species/generation1/clefable.json | 2 +- .../species/generation1/clefairy.json | 2 +- .../species/generation1/cloyster.json | 2 +- .../cobblemon/species/generation1/cubone.json | 6 +++++- .../cobblemon/species/generation2/aipom.json | 9 ++++++++ .../species/generation2/ampharos.json | 9 +++++--- .../species/generation2/ariados.json | 3 +-- .../species/generation2/azumarill.json | 3 +-- .../species/generation2/chinchou.json | 10 ++++++++- .../species/generation2/donphan.json | 18 ++++++++++++++++ .../species/generation2/feraligatr.json | 2 +- .../species/generation2/flaaffy.json | 12 ++++++----- .../species/generation2/forretress.json | 2 +- .../cobblemon/species/generation2/gligar.json | 6 +++++- .../species/generation2/granbull.json | 5 ++--- .../species/generation2/hoothoot.json | 9 +++++--- .../species/generation2/lanturn.json | 10 ++++++++- .../species/generation2/magcargo.json | 17 +++++++++++++++ .../cobblemon/species/generation2/mareep.json | 9 +++++--- .../species/generation2/meganium.json | 4 ++-- .../species/generation2/miltank.json | 9 +++++--- .../species/generation2/misdreavus.json | 6 +++++- .../species/generation2/murkrow.json | 6 +++++- .../cobblemon/species/generation2/natu.json | 4 ++++ .../species/generation2/noctowl.json | 4 ++++ .../species/generation2/piloswine.json | 10 ++++++++- .../cobblemon/species/generation2/pineco.json | 6 +++++- .../species/generation2/quagsire.json | 6 +++++- .../cobblemon/species/generation2/slugma.json | 2 +- .../species/generation2/sneasel.json | 6 +++++- .../species/generation2/snubbull.json | 4 ++-- .../species/generation2/spinarak.json | 9 ++++++-- .../species/generation2/stantler.json | 6 +++++- .../species/generation2/sudowoodo.json | 6 +++++- .../cobblemon/species/generation2/swinub.json | 10 ++++++++- .../species/generation2/teddiursa.json | 21 +++++++++++++++++++ .../species/generation2/typhlosion.json | 2 +- .../species/generation2/ursaring.json | 21 +++++++++++++++++++ .../cobblemon/species/generation2/wooper.json | 6 +++++- .../cobblemon/species/generation2/xatu.json | 6 +++++- .../cobblemon/species/generation2/yanma.json | 4 ++-- .../cobblemon/species/generation3/baltoy.json | 6 +++++- .../species/generation3/barboach.json | 6 +++++- .../species/generation3/blaziken.json | 2 +- .../species/generation3/breloom.json | 3 +-- .../cobblemon/species/generation3/cacnea.json | 4 ++++ .../species/generation3/cacturne.json | 4 ++++ .../species/generation3/camerupt.json | 1 - .../species/generation3/carvanha.json | 6 +++++- .../species/generation3/chimecho.json | 1 - .../species/generation3/clamperl.json | 20 +++++++++--------- .../species/generation3/claydol.json | 6 +++++- .../species/generation3/dusclops.json | 3 +-- .../species/generation3/exploud.json | 9 ++++++++ .../species/generation3/gardevoir.json | 13 ++++++++++-- .../species/generation3/gorebyss.json | 2 +- .../species/generation3/huntail.json | 2 +- .../species/generation3/illumise.json | 10 ++++++--- .../cobblemon/species/generation3/kirlia.json | 10 ++++++++- .../species/generation3/linoone.json | 9 ++++++++ .../cobblemon/species/generation3/lombre.json | 10 ++++++++- .../cobblemon/species/generation3/lotad.json | 10 ++++++++- .../species/generation3/loudred.json | 1 - .../species/generation3/ludicolo.json | 10 ++++++++- .../species/generation3/masquerain.json | 12 +++++++++-- .../cobblemon/species/generation3/mawile.json | 6 +++++- .../species/generation3/mightyena.json | 6 +++++- .../cobblemon/species/generation3/minun.json | 6 +++++- .../species/generation3/nincada.json | 9 ++++++++ .../species/generation3/nosepass.json | 10 ++++++++- .../species/generation3/nuzleaf.json | 14 +++++++++++++ .../species/generation3/pelipper.json | 1 - .../cobblemon/species/generation3/plusle.json | 6 +++++- .../species/generation3/poochyena.json | 4 ++++ .../cobblemon/species/generation3/ralts.json | 10 ++++++++- .../species/generation3/rayquaza.json | 9 ++++++++ .../species/generation3/relicanth.json | 10 ++++++--- .../species/generation3/sableye.json | 6 +++++- .../species/generation3/sceptile.json | 2 +- .../cobblemon/species/generation3/seedot.json | 13 ++++++++++++ .../species/generation3/sharpedo.json | 6 +++++- .../species/generation3/shiftry.json | 14 +++++++++++++ .../species/generation3/shroomish.json | 4 ---- .../cobblemon/species/generation3/spinda.json | 6 +++++- .../species/generation3/surskit.json | 13 ++++++++++++ .../species/generation3/swampert.json | 2 +- .../species/generation3/swellow.json | 3 +-- .../species/generation3/taillow.json | 3 +-- .../species/generation3/torkoal.json | 6 +++++- .../species/generation3/volbeat.json | 10 ++++++--- .../species/generation3/wailmer.json | 6 +++++- .../species/generation3/wailord.json | 6 +++++- .../species/generation3/whiscash.json | 6 +++++- .../species/generation3/zigzagoon.json | 9 ++++++++ .../species/generation7/araquanid.json | 13 ++++++++++++ .../cobblemon/species/generation7/bewear.json | 5 ++--- .../species/generation7/blacephalon.json | 9 ++++++++ .../species/generation7/bounsweet.json | 5 ++--- .../species/generation7/brionne.json | 2 +- .../species/generation7/bruxish.json | 16 ++++++++++++++ .../species/generation7/buzzwole.json | 9 ++++++++ .../species/generation7/celesteela.json | 9 ++++++++ .../species/generation7/charjabug.json | 14 +++++++++++++ .../cobblemon/species/generation7/comfey.json | 13 ++++++++++++ .../species/generation7/crabominable.json | 2 +- .../species/generation7/crabrawler.json | 5 ++--- .../species/generation7/cutiefly.json | 8 +++++-- .../species/generation7/decidueye.json | 4 ++++ .../species/generation7/dewpider.json | 13 ++++++++++++ .../species/generation7/golisopod.json | 9 ++++++++ .../species/generation7/incineroar.json | 2 +- .../cobblemon/species/generation7/komala.json | 12 +++++++++++ .../species/generation7/mimikyu.json | 8 +++++-- .../species/generation7/morelull.json | 6 +++++- .../species/generation7/mudbray.json | 10 ++++++++- .../species/generation7/mudsdale.json | 10 ++++++++- .../species/generation7/oranguru.json | 13 ++++++++++++ .../species/generation7/oricorio.json | 21 +++++++++++++++++++ .../species/generation7/poipole.json | 10 +++++++++ .../species/generation7/primarina.json | 2 +- .../species/generation7/ribombee.json | 4 ++-- .../species/generation7/shiinotic.json | 6 +++++- .../species/generation7/steenee.json | 3 +-- .../species/generation7/stufful.json | 2 +- .../species/generation7/tsareena.json | 5 ++--- .../cobblemon/species/generation7/wimpod.json | 9 ++++++++ 136 files changed, 806 insertions(+), 163 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/abra.json b/common/src/main/resources/data/cobblemon/species/generation1/abra.json index b26f48dd62..1ad28b681f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/abra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/abra.json @@ -42,7 +42,7 @@ "human_like" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:ender_pearl", @@ -51,6 +51,10 @@ { "item": "cobblemon:twisted_spoon", "percentage": 2.5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json index 85db88e373..5b75d96d92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json @@ -90,7 +90,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:bone", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json index e6aa13b617..a1230a046c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json @@ -80,7 +80,7 @@ "human_like" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:ender_pearl", @@ -90,6 +90,10 @@ { "item": "cobblemon:twisted_spoon", "percentage": 10 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json index d067839371..24fe0764e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json @@ -39,15 +39,11 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 1, "entries": [ { "item": "cobblemon:razor_fang", "percentage": 5 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json index 4d3dd44b36..0cead511b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json @@ -91,11 +91,15 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 5 + }, + { + "item": "cobblemon:pinap_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json index 12894d6903..2038912069 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json @@ -26,11 +26,15 @@ "grass" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index 7a39ed8b70..cac9adf9d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -119,7 +119,7 @@ "water_1" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:scute", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json index ca3e39d9b6..9ac6bc2ee8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json @@ -95,11 +95,15 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:silver_powder", "percentage": 5 + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json b/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json index 6eece9bf04..2d165d06cf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json @@ -40,11 +40,15 @@ "bug" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:string", "percentage": 50 + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index 74f529e1e4..8f38632c90 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -168,7 +168,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:blaze_powder", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json index 8ce8a19649..1027efe756 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json @@ -41,7 +41,7 @@ "percentage": 10 }, { - "item": "cobblemon:leppa_berry", + "item": "cobblemon:babiri_berry", "percentage": 10 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json index dbef7136ad..72a661bb27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json @@ -41,7 +41,7 @@ "percentage": 5 }, { - "item": "cobblemon:leppa_berry", + "item": "cobblemon:babiri_berry", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json index 60d8d07170..b81bcbdbe6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json @@ -14,7 +14,7 @@ "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 10 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json index a9e6db5db6..2e8ae4dbd2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json @@ -26,11 +26,15 @@ "monster" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:bone", "percentage": 50 + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/aipom.json b/common/src/main/resources/data/cobblemon/species/generation2/aipom.json index 509722d6c2..a5dfa19e12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/aipom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/aipom.json @@ -8,6 +8,15 @@ "pickup", "h:skilllink" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:nanab_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 55, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index a10e6c0e0a..1bf0635b08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -8,12 +8,15 @@ "h:plus" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:mutton", - "quantityRange": "2-4", - "percentage": 100 + "quantityRange": "2-4" + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json index 9dae60c4c8..c03a4cb45c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json @@ -28,8 +28,7 @@ }, { "item": "minecraft:rotten_flesh", - "quantityRange": "1-3", - "percentage": 100 + "quantityRange": "1-2" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json index 5f850869b5..57cd745b99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json @@ -13,8 +13,7 @@ "entries": [ { "item": "cobblemon:kebia_berry", - "quantityRange": "1-2", - "percentage": 2.5 + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json index 46aaf42920..909d2ba051 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json @@ -10,11 +10,19 @@ "h:waterabsorb" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { "item": "minecraft:prismarine_crystals", "percentage": 50 + }, + { + "item": "cobblemon:deep_sea_scale", + "percentage": 2.5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json index fd0e5c7f38..0b05cef34b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json @@ -7,6 +7,24 @@ "sturdy", "h:sandveil" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:protector", + "percentage": 5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 90, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json index 7023ba1111..a2699c3e06 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json @@ -12,7 +12,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json index c5334d01f1..cf4ecaf46c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json @@ -8,16 +8,18 @@ "h:plus" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:mutton", - "quantityRange": "1-3", - "percentage": 100 + "quantityRange": "1-3" }, { - "item": "minecraft:white_wool", - "percentage": 100 + "item": "minecraft:white_wool" + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json index 16563f8c8b..be96165604 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json @@ -45,7 +45,7 @@ "percentage": 66 }, { - "item": "cobblemon:metal_coat", + "item": "cobblemon:occa_berry", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json index f96e6e90da..be515eec20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json @@ -10,7 +10,7 @@ "h:immunity" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "cobblemon:razor_fang", @@ -19,6 +19,10 @@ { "item": "cobblemon:poison_barb", "percentage": 2.5 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json index 30a972e7e6..96e90ce7d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json @@ -17,9 +17,8 @@ "percentage": 66 }, { - "item": "minecraft:rotten_flesh", - "quantityRange": "1-2", - "percentage": 66 + "item": "cobblemon:babiri_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json index 074aa48681..21bf91a0a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json @@ -10,19 +10,22 @@ "h:tintedlens" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", "percentage": 50 }, { - "item": "minecraft:chicken", - "percentage": 100 + "item": "minecraft:chicken" }, { "item": "cobblemon:wise_glasses", "percentage": 2.5 + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json index ab725d821a..c2d9a8bb28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json @@ -10,12 +10,20 @@ "h:waterabsorb" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { "item": "minecraft:prismarine_crystals", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:deep_sea_scale", + "percentage": 5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json index 9c6f474aa1..1607981eda 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json @@ -9,6 +9,23 @@ "flamebody", "h:weakarmor" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:magma_cream", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:basalt" + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json index 2c85f91cde..7b84571746 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json @@ -36,16 +36,19 @@ } }, "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:mutton", - "quantityRange": "1-2", - "percentage": 66 + "quantityRange": "1-2" }, { "item": "minecraft:white_wool", "quantityRange": "1-2" + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json index de87ca9a46..9e404395c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json @@ -39,11 +39,11 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json index 5a65c629d9..65536d7caa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json @@ -37,7 +37,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:leather", @@ -46,8 +46,11 @@ }, { "item": "minecraft:beef", - "quantityRange": "1-3", - "percentage": 75 + "quantityRange": "1-3" + }, + { + "item": "cobblemon:oran_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json index 14a68ef425..94b9b7a680 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json @@ -24,11 +24,15 @@ "amorphous" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", "percentage": 2.5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json b/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json index 863f0eaeb7..e7c5ec4954 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json @@ -41,7 +41,7 @@ "flying" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:feather", @@ -49,6 +49,10 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/natu.json b/common/src/main/resources/data/cobblemon/species/generation2/natu.json index 52a4f83af4..eade019f61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/natu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/natu.json @@ -45,6 +45,10 @@ { "item": "cobblemon:wise_glasses", "percentage": 2.5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json index 96184c503c..062b7dc3cf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json @@ -23,6 +23,10 @@ { "item": "cobblemon:wise_glasses", "percentage": 5 + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json index eb98471318..ec22b0daad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json @@ -35,7 +35,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:porkchop", @@ -44,6 +44,14 @@ { "item": "minecraft:brown_wool", "quantityRange": "1-2" + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json index ff81947231..d935c84ec3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json @@ -33,11 +33,15 @@ "bug" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:string", "percentage": 50 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json index 2fb8e25343..1d4bb23b9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json @@ -36,12 +36,16 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json index 6e5321caa0..92ff0b7a74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json @@ -16,7 +16,7 @@ "percentage": 50 }, { - "item": "cobblemon:shuca_berry", + "item": "cobblemon:passho_berry", "percentage": 2.5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json index bec31374de..115f4dd948 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json @@ -171,7 +171,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "cobblemon:razor_claw", @@ -180,6 +180,10 @@ { "item": "cobblemon:quick_claw", "percentage": 2.5 + }, + { + "item": "cobblemon:chople_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json index 3d5a7378db..1249ff34e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json @@ -16,8 +16,8 @@ "percentage": 50 }, { - "item": "minecraft:rotten_flesh", - "percentage": 50 + "item": "cobblemon:babiri_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json index 8cd444d965..2df062aaf1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json @@ -10,7 +10,7 @@ "h:sniper" ], "drops": { - "amount": 1, + "amount": 4, "entries": [ { "item": "minecraft:string", @@ -21,7 +21,12 @@ "percentage": 50 }, { - "item": "minecraft:rotten_flesh" + "item": "minecraft:rotten_flesh", + "percentage": 50 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/stantler.json b/common/src/main/resources/data/cobblemon/species/generation2/stantler.json index 74876b5905..920c7e5930 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/stantler.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/stantler.json @@ -34,11 +34,15 @@ "field" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:leather", "percentage": 50 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json index c265839fb0..4cced6f698 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json @@ -9,11 +9,15 @@ "h:rattled" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:hard_stone", "percentage": 5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json index 22d4738eae..8cd945adc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json @@ -35,13 +35,21 @@ "field" ], "drops": { - "amount": "2", + "amount": 4, "entries": [ { "item": "minecraft:porkchop" }, { "item": "minecraft:brown_wool" + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 2.5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json b/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json index 914e2efef9..99b652cb62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json @@ -8,6 +8,27 @@ "quickfeet", "h:honeygather" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "1-3" + }, + { + "item": "cobblemon:honey_bottle", + "percentage": 2.5 + }, + { + "item": "cobblemon:peat_block", + "percentage": 2.5 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json index 623ea9b079..87765eb768 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json @@ -12,7 +12,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json index 041fe5d9cc..bf84fa5593 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json @@ -8,6 +8,27 @@ "quickfeet", "h:unnerve" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "2-4" + }, + { + "item": "minecraft:honey_bottle", + "percentage": 5 + }, + { + "item": "cobblemon:peat_block", + "percentage": 5 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 90, "attack": 130, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json index 75f26a8bf5..a53ea152ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json @@ -173,11 +173,15 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", "percentage": 50 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json index 76a4ba27c6..2239304ddb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json @@ -38,7 +38,7 @@ "flying" ], "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -51,6 +51,10 @@ { "item": "cobblemon:wise_glasses", "percentage": 5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json index 7618282f8b..3695e22b98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json @@ -13,8 +13,8 @@ "amount": 1, "entries": [ { - "item": "cobblemon:wide_lens", - "percentage": 5 + "item": "cobblemon:charti_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json b/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json index 3efa147d28..1dbb5de208 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json @@ -25,7 +25,7 @@ "mineral" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:clay_ball", @@ -34,6 +34,10 @@ { "item": "cobblemon:light_clay", "percentage": 2.5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json index c30414f2d5..988671f5db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json @@ -10,11 +10,15 @@ "h:hydration" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", "percentage": 50 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json index 63a932d564..94a30203f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json @@ -85,7 +85,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json index d728d39d2b..b3370cf4f8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json @@ -19,8 +19,7 @@ }, { "item": "cobblemon:kasib_berry", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json index f125f0ef32..d18775fcbd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json @@ -17,6 +17,10 @@ { "item": "cobblemon:poison_barb", "percentage": 2.5 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json index 7a21a826a4..2d95bb1bf2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json @@ -19,6 +19,10 @@ { "item": "cobblemon:poison_barb", "percentage": 5 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json index c7fc814a6d..9e094bfac0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -18,7 +18,6 @@ }, { "item": "cobblemon:rawst_berry", - "quantityRange": "1-2", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json b/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json index 3b1a0fde59..4ed79571ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json @@ -39,11 +39,15 @@ } }, "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:deep_sea_tooth", "percentage": 2.5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json index 540d256d99..1f0c04e50b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json @@ -11,7 +11,6 @@ "entries": [ { "item": "cobblemon:colbur_berry", - "quantityRange": "1-2", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json b/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json index 6dc0458414..e278b0aae2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json @@ -99,16 +99,16 @@ "tutor:waterpulse", "tutor:whirlpool" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:prismarine_shard", - "quantityRange": "1-2", - "percentage": 66 - } - ] - }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:prismarine_shard", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, "labels": [ "gen3" diff --git a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json index b3c126be81..0dbbfb0d23 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json @@ -33,7 +33,7 @@ "mineral" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:clay_ball", @@ -43,6 +43,10 @@ { "item": "cobblemon:light_clay", "percentage": 5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json index 9c58d10dc8..ff3a8c4165 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json @@ -16,8 +16,7 @@ }, { "item": "cobblemon:kasib_berry", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json index 934c0b59a9..088fbfdae5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json @@ -7,6 +7,15 @@ "soundproof", "h:scrappy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 104, "attack": 91, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json index 9cdf978779..97411edba5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json @@ -10,15 +10,24 @@ "h:telepathy" ], "drops": { - "amount": 2, + "amount": 4, "entries": [ { "item": "minecraft:ender_pearl", - "percentage": 75 + "percentage": 75, + "quantityRange": "1-3" }, { "item": "cobblemon:twisted_spoon", "percentage": 10 + }, + { + "item": "cobblemon:dawn_stone", + "percentage": 10 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json index 343ed24b04..1e4bc0fdd9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json @@ -12,7 +12,7 @@ "entries": [ { "item": "cobblemon:deep_sea_scale", - "percentage": 10 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json index 9f46ddb254..6a1ef4158a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json @@ -12,7 +12,7 @@ "entries": [ { "item": "cobblemon:deep_sea_tooth", - "percentage": 10 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json index 805f18a8d7..de30963ac0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json @@ -9,11 +9,15 @@ "h:prankster" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:glowstone_dust", - "percentage": 50 + "item": "cobblemon:bright_powder", + "percentage": 5 + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json index 59e5c3c9ee..23db0b843a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json @@ -10,7 +10,7 @@ "h:telepathy" ], "drops": { - "amount": 1, + "amount": 4, "entries": [ { "item": "minecraft:ender_pearl", @@ -20,6 +20,14 @@ { "item": "cobblemon:twisted_spoon", "percentage": 5 + }, + { + "item": "cobblemon:dawn_stone", + "percentage": 5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json index cd51ecb077..097cd9e9c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json @@ -8,6 +8,15 @@ "gluttony", "h:quickfeet" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 78, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json index 0180aba5e5..04c80ef127 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json @@ -44,12 +44,20 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:lily_pad", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:mental_herb", + "percentage": 5 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lotad.json b/common/src/main/resources/data/cobblemon/species/generation3/lotad.json index 55990b6d92..a43a48c90a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lotad.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lotad.json @@ -47,11 +47,19 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:lily_pad", "percentage": 50 + }, + { + "item": "cobblemon:mental_herb", + "percentage": 2.5 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json index 9966e4c3a0..f532821f28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -12,7 +12,6 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "quantityRange": "1-2", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json index 0e3a3c844e..eafc74a32e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json @@ -43,12 +43,20 @@ } }, "drops": { - "amount": "1", + "amount": 3, "entries": [ { "item": "minecraft:lily_pad", "quantityRange": "1-3", "percentage": 75 + }, + { + "item": "cobblemon:mental_herb", + "percentage": 10 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json index a5d6617c09..34a9dde92c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json @@ -9,11 +9,19 @@ "h:unnerve" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { - "item": "cobblemon:silver_powder", + "item": "minecraft:honey_bottle", "percentage": 2.5 + }, + { + "item": "cobblemon:silver_powder", + "percentage": 5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json index 9df6f49c20..43f5e7860a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -76,11 +76,15 @@ "fairy" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:razor_fang", "percentage": 5 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json index 7cd00f9d3c..8485fd128b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json @@ -9,7 +9,7 @@ "h:moxie" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:bone", @@ -20,6 +20,10 @@ "item": "minecraft:rotten_flesh", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/minun.json b/common/src/main/resources/data/cobblemon/species/generation3/minun.json index f3c92d3a95..1984bf780d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/minun.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/minun.json @@ -25,11 +25,15 @@ "fairy" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:magnet", "percentage": 5 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nincada.json b/common/src/main/resources/data/cobblemon/species/generation3/nincada.json index 01b6a6ed30..0b4cd01505 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nincada.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nincada.json @@ -8,6 +8,15 @@ "compoundeyes", "h:runaway" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:soft_sand", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 31, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json index 5cf5cf7716..52cbf9658e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json @@ -9,7 +9,7 @@ "h:sandforce" ], "drops": { - "amount": 2, + "amount": 4, "entries": [ { "item": "minecraft:flint", @@ -18,6 +18,14 @@ { "item": "cobblemon:magnet", "percentage": 2.5 + }, + { + "item": "cobblemon:hard_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:chople_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json index 38312e1cff..4af9868b01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json @@ -9,6 +9,20 @@ "earlybird", "h:pickpocket" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:dark_oak_sapling", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json index 38204c0b4a..8fd1e10d81 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json @@ -22,7 +22,6 @@ }, { "item": "cobblemon:wacan_berry", - "quantityRange": "1-2", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json index 8f67330ed5..8a6b62ab10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json @@ -25,11 +25,15 @@ "fairy" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:magnet", "percentage": 5 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json index cd149601f4..6e0e067a77 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json @@ -18,6 +18,10 @@ { "item": "minecraft:rotten_flesh", "percentage": 50 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json index d1c089bc1c..bc311e13e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json @@ -10,7 +10,7 @@ "h:telepathy" ], "drops": { - "amount": 2, + "amount": 4, "entries": [ { "item": "minecraft:ender_pearl", @@ -19,6 +19,14 @@ { "item": "cobblemon:twisted_spoon", "percentage": 2.5 + }, + { + "item": "cobblemon:dawn_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json index 3441b994e0..e29b9bc398 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json @@ -7,6 +7,15 @@ "abilities": [ "airlock" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:dragons_breath", + "quantityRange": "3-5" + } + ] + }, "baseStats": { "hp": 105, "attack": 150, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json index 39e65851ef..e4fe55c619 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json @@ -9,12 +9,16 @@ "rockhead", "h:sturdy" ], - "drops": { - "amount": 1, + "drops": { + "amount": 2, "entries": [ { "item": "cobblemon:deep_sea_scale", - "percentage": 20 + "percentage": 5 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json index 49b743a4e0..37aa166947 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json @@ -74,7 +74,7 @@ "human_like" ], "drops": { - "amount": "3", + "amount": 4, "entries": [ { "item": "minecraft:amethyst_shard", @@ -88,6 +88,10 @@ { "item": "minecraft:emerald", "percentage": 5 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json index bf32df8931..b72c01afd0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json @@ -83,7 +83,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json index b4f3bdb8c2..44241f400e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json @@ -8,6 +8,19 @@ "earlybird", "h:pickpocket" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:dark_oak_sapling", + "percent": 50 + }, + { + "item": "cobblemon:tanga_berry", + "percent": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json index 43f00a2efe..2f29514b7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json @@ -86,11 +86,15 @@ "water_2" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:deep_sea_tooth", "percentage": 5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json index 014b85fc45..a5321f6daf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json @@ -9,6 +9,20 @@ "earlybird", "h:pickpocket" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:dark_oak_sapling", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 90, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json index 37be35aade..55044813ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json @@ -15,10 +15,6 @@ "item": "minecraft:brown_mushroom", "percentage": 50 }, - { - "item": "cobblemon:big_root", - "percentage": 2.5 - }, { "item": "cobblemon:kebia_berry", "percentage": 2.5 diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json index 4aecc0df6f..ec0008e178 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json @@ -27,12 +27,16 @@ "human_like" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:bamboo", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/surskit.json b/common/src/main/resources/data/cobblemon/species/generation3/surskit.json index 460671a6ff..6b61331da1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/surskit.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/surskit.json @@ -8,6 +8,19 @@ "swiftswim", "h:raindish" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:honey_bottle", + "percentage": 2.5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json index de6b2d51b9..76acfd63e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json @@ -84,7 +84,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index 457c6837f4..e85f394705 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json @@ -25,8 +25,7 @@ }, { "item": "cobblemon:charti_berry", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json index 54aa87dbca..721bc370bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json @@ -20,8 +20,7 @@ }, { "item": "cobblemon:charti_berry", - "quantityRange": "1-2", - "percentage": 5 + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json index ef6beda65a..a5f2279b04 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json @@ -26,7 +26,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 3, "entries": [ { "item": "minecraft:coal", @@ -36,6 +36,10 @@ { "item": "cobblemon:charcoal_stick", "percentage": 5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json index a7588b6c5f..b5256ecc0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json @@ -9,11 +9,15 @@ "h:prankster" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:glowstone_dust", - "percentage": 50 + "item": "cobblemon:bright_powder", + "percentage": 5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json index b26fc12a99..4949205011 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json @@ -40,11 +40,15 @@ "water_2" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:bone_block", "percentage": 50 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json index 5bea4ab66a..a3b0984953 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json @@ -46,12 +46,16 @@ "water_2" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:bone_block", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json index 268bea4c38..655d60da40 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json @@ -10,12 +10,16 @@ "h:hydration" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json index 824124e74e..2168c89639 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json @@ -8,6 +8,15 @@ "gluttony", "h:quickfeet" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 38, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json index 831d511ab3..c1da490f65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json @@ -7,6 +7,19 @@ "waterbubble", "h:waterabsorb" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 5 + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 68, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json index ae0303db1e..e7f9474178 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json @@ -13,9 +13,8 @@ "amount": 1, "entries": [ { - "item": "cobblemon:chilan_berry", - "percentage": 5, - "quantityRange": "1-2" + "item": "cobblemon:chople_berry", + "percentage": 5 } ] }, 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 36a443422f..354d3b4186 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json @@ -6,6 +6,15 @@ "abilities": [ "beastboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "baseStats": { "hp": 53, "attack": 127, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json index 338a38945e..f51506f70a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json @@ -12,9 +12,8 @@ "amount": 1, "entries": [ { - "item": "cobblemon:cheri_berry", - "percentage": 2.5, - "quantityRange": "1-2" + "item": "cobblemon:persim_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json index a2f7b28131..b4252e89c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json index 13385cf080..ab28ecb8b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json @@ -8,6 +8,22 @@ "strongjaw", "h:wonderskin" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:cod" + }, + { + "item": "minecraft:bone_meal", + "percentage": 5 + }, + { + "item": "cobblemon:razor_fang", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 68, "attack": 105, 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 049b672481..8dfab7df0b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json @@ -6,6 +6,15 @@ "abilities": [ "beastboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "baseStats": { "hp": 107, "attack": 139, 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 1afebf57f3..c5439cd386 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json @@ -6,6 +6,15 @@ "abilities": [ "beastboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "baseStats": { "hp": 97, "attack": 101, 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 05fad0a78a..f074a882d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json @@ -6,6 +6,20 @@ "abilities": [ "battery" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:string", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 57, "attack": 82, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json index 858e701200..e70356b805 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json @@ -8,6 +8,19 @@ "triage", "h:naturalcure" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:misty_seed", + "percentage": 5 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 51, "attack": 52, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json index f9222cd677..68d81d4a43 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json @@ -13,7 +13,7 @@ "amount": 1, "entries": [ { - "item": "cobblemon:pinap_berry", + "item": "cobblemon:aspear_berry", "percentage": 10, "quantityRange": "1-3" } diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json index 8fbaa35504..9c736cc173 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json @@ -12,9 +12,8 @@ "amount": 1, "entries": [ { - "item": "cobblemon:pinap_berry", - "percentage": 5, - "quantityRange": "1-2" + "item": "cobblemon:aspear_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json index adaec479c5..0c600b4b60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json @@ -10,11 +10,15 @@ "h:sweetveil" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:honeycomb", + "item": "minecraft:honey_bottle", "percentage": 50 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json index b2515cdfa7..e6a9a5c445 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json @@ -149,6 +149,10 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:miracle_seed", + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json index 248c2d9958..5414042b11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json @@ -7,6 +7,19 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json index d4590390f4..d10470fd3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json @@ -7,6 +7,15 @@ "abilities": [ "emergencyexit" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:bluk_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json index 4ffb58da49..4af94f4cf7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json @@ -30,7 +30,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/komala.json b/common/src/main/resources/data/cobblemon/species/generation7/komala.json index 68da8bb58e..e512bf2751 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/komala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/komala.json @@ -14,6 +14,18 @@ "special_defence": 95, "speed": 65 }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:acacia_log" + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 + } + ] + }, "catchRate": 45, "maleRatio": 0.5, "shoulderMountable": false, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json index 0114ca1eb0..68b8c28bac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json @@ -25,11 +25,15 @@ "amorphous" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json index 2695a9386a..0d27ed0648 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json @@ -27,11 +27,15 @@ "grass" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:brown_mushroom", "percentage": 50 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json index f95f93df92..676dda061c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json @@ -9,7 +9,7 @@ "h:innerfocus" ], "drops": { - "amount": 2, + "amount": 4, "entries": [ { "item": "minecraft:leather", @@ -18,6 +18,14 @@ { "item": "minecraft:clay_ball", "percentage": 50 + }, + { + "item": "cobblemon:light_clay", + "percentage": 2.5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json index 8a925a89e8..476613d2f8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json @@ -9,7 +9,7 @@ "h:innerfocus" ], "drops": { - "amount": 2, + "amount": 4, "entries": [ { "item": "minecraft:leather", @@ -20,6 +20,14 @@ "item": "minecraft:clay_ball", "percentage": 66, "quantityRange": "1-2" + }, + { + "item": "cobblemon:light_clay", + "percentage": 5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 } ] }, 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 a0f7f80772..80b9476f72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -8,6 +8,19 @@ "telepathy", "h:symbiosis" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:wise_glasses", + "percentage": 5 + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 90, "attack": 60, 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 1a6651482e..a9254ab5cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -6,6 +6,27 @@ "abilities": [ "dancer" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "minecraft:honey_bottle", + "percentage": 5 + }, + { + "item": "cobblemon:pinap_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json index 315797f01d..e185b95c14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json @@ -6,6 +6,16 @@ "abilities": [ "beastboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:echo_shard", + "percentage": 66, + "quantityRange": "1-2" + } + ] + }, "baseStats": { "hp": 67, "attack": 73, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json index f1608f075d..e9e1598cd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json @@ -48,7 +48,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json index ab429a70d6..1d07682399 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json @@ -18,8 +18,8 @@ "quantityRange": "1-2" }, { - "item": "minecraft:silver_powder", - "percentage": 2.5 + "item": "cobblemon:cheri_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json index 9438e1f05f..21d1125665 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json @@ -27,12 +27,16 @@ "grass" ], "drops": { - "amount": "1", + "amount": 2, "entries": [ { "item": "minecraft:brown_mushroom", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json index 61e67aaa74..c9cf16d56c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -13,8 +13,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5, - "quantityRange": "1-2" + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json index 63fa4843ea..ed793435a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json @@ -13,7 +13,7 @@ "amount": 1, "entries": [ { - "item": "cobblemon:chilan_berry", + "item": "cobblemon:chople_berry", "percentage": 2.5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json index 161c10f694..8b1b45dae7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -12,9 +12,8 @@ "amount": 1, "entries": [ { - "item": "cobblemon:cheri_berry", - "percentage": 10, - "quantityRange": "1-4" + "item": "cobblemon:persim_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json b/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json index 282f99b8a1..5aaaacd33f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json @@ -7,6 +7,15 @@ "abilities": [ "wimpout" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:bluk_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 25, "attack": 35, From e0cdc08cd3fdf818e459c6031a3d7f1594832ee6 Mon Sep 17 00:00:00 2001 From: miasmus <15349355-miasmusa@users.noreply.gitlab.com> Date: Sat, 7 Oct 2023 19:51:22 -0400 Subject: [PATCH 24/40] gen 4 drops --- .../species/generation4/abomasnow.json | 17 ++++++++ .../species/generation4/bastiodon.json | 10 +++++ .../species/generation4/bibarel.json | 25 ++++++----- .../cobblemon/species/generation4/bidoof.json | 24 +++++++---- .../species/generation4/bronzong.json | 25 +++++++++++ .../species/generation4/bronzor.json | 25 +++++++++++ .../cobblemon/species/generation4/buizel.json | 12 +++--- .../species/generation4/buneary.json | 41 ++++++++++-------- .../cobblemon/species/generation4/burmy.json | 13 ++++++ .../species/generation4/carnivine.json | 10 ++++- .../cobblemon/species/generation4/chatot.json | 8 +++- .../species/generation4/cherrim.json | 13 ++++++ .../species/generation4/cherubi.json | 13 ++++++ .../species/generation4/chimchar.json | 18 ++++---- .../cobblemon/species/generation4/combee.json | 16 ++++++- .../species/generation4/cranidos.json | 9 ++++ .../species/generation4/croagunk.json | 13 ++++++ .../species/generation4/darkrai.json | 8 ++++ .../species/generation4/drapion.json | 13 ++++++ .../species/generation4/drifblim.json | 9 ++++ .../species/generation4/drifloon.json | 9 ++++ .../species/generation4/empoleon.json | 34 +++++++-------- .../species/generation4/finneon.json | 16 +++++++ .../species/generation4/floatzel.json | 1 - .../cobblemon/species/generation4/gabite.json | 22 ++++++---- .../species/generation4/garchomp.json | 22 ++++++---- .../species/generation4/gastrodon.json | 14 ++++++ .../cobblemon/species/generation4/gible.json | 22 ++++++---- .../species/generation4/glameow.json | 9 ++++ .../cobblemon/species/generation4/grotle.json | 18 ++++---- .../species/generation4/hippopotas.json | 13 ++++++ .../species/generation4/hippowdon.json | 13 ++++++ .../species/generation4/infernape.json | 18 ++++---- .../species/generation4/kricketot.json | 18 ++++---- .../species/generation4/kricketune.json | 18 ++++---- .../species/generation4/lopunny.json | 43 +++++++++++-------- .../species/generation4/lucario.json | 9 ++++ .../species/generation4/lumineon.json | 16 +++++++ .../cobblemon/species/generation4/luxio.json | 6 ++- .../cobblemon/species/generation4/luxray.json | 6 ++- .../species/generation4/monferno.json | 18 ++++---- .../cobblemon/species/generation4/mothim.json | 13 ++++++ .../species/generation4/pachirisu.json | 2 +- .../cobblemon/species/generation4/piplup.json | 32 +++++++------- .../species/generation4/prinplup.json | 34 +++++++-------- .../species/generation4/purugly.json | 9 ++++ .../species/generation4/rampardos.json | 10 +++++ .../cobblemon/species/generation4/riolu.json | 9 ++++ .../species/generation4/shellos.json | 13 ++++++ .../species/generation4/shieldon.json | 9 ++++ .../cobblemon/species/generation4/shinx.json | 7 ++- .../species/generation4/skorupi.json | 13 ++++++ .../species/generation4/skuntank.json | 9 ++++ .../cobblemon/species/generation4/snover.json | 17 ++++++++ .../species/generation4/spiritomb.json | 18 ++++---- .../species/generation4/staraptor.json | 1 - .../species/generation4/staravia.json | 1 - .../cobblemon/species/generation4/stunky.json | 9 ++++ .../species/generation4/torterra.json | 18 ++++---- .../species/generation4/toxicroak.json | 13 ++++++ .../species/generation4/turtwig.json | 18 ++++---- .../species/generation4/vespiquen.json | 16 ++++++- .../species/generation4/wormadam.json | 14 ++++++ 63 files changed, 719 insertions(+), 233 deletions(-) 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 74572c06fb..c57a1e6729 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json @@ -7,6 +7,23 @@ "snowwarning", "h:soundproof" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snowball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 5 + }, { + "item": "cobblemon:occa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 90, "attack": 92, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json b/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json index 835fd58947..916652171c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json @@ -7,6 +7,16 @@ "sturdy", "h:soundproof" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 60, "attack": 52, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json index 1c9e0457e8..029f43de55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json @@ -9,6 +9,21 @@ "unaware", "h:moody" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:stick", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:oran_berry", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 79, "attack": 85, @@ -37,16 +52,6 @@ } } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:stick", - "quantityRange": "1-2", - "percentage": 66 - } - ] - }, "moves": [ "1:aquajet", "1:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json b/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json index ef2cef4b85..55cc775a9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json @@ -8,6 +8,21 @@ "unaware", "h:moody" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:stick", + "quantityRange": "1", + "percentage": 50 + }, + { + "item": "cobblemon:oran_berry", + "quantityRange": "1", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 59, "attack": 45, @@ -45,15 +60,6 @@ "light": "0-4" } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:stick", - "percentage": 50 - } - ] - }, "moves": [ "1:growl", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json index c4b16dd6c0..a65ee8ef53 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json @@ -8,6 +8,31 @@ "heatproof", "h:heavymetal" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:raw_iron", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:mental_herb", + "quantityRange": "1", + "percentage": 5 + }, + { + "item": "cobblemon:light_clay", + "quantityRange": "1", + "percentage": 5 + }, + { + "item": "cobblemon:occa_berry", + "quantityRange": "1", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 67, "attack": 89, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json index a20a593ac6..05db724dfc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json @@ -8,6 +8,31 @@ "heatproof", "h:heavymetal" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:raw_iron", + "quantityRange": "1", + "percentage": 50 + }, + { + "item": "cobblemon:mental_herb", + "quantityRange": "1", + "percentage": 2.5 + }, + { + "item": "cobblemon:light_clay", + "quantityRange": "1", + "percentage": 2.5 + }, + { + "item": "cobblemon:occa_berry", + "quantityRange": "1", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 57, "attack": 24, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json index 8d12c96161..bd4d63921a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json @@ -11,14 +11,14 @@ "amount": 2, "entries": [ { - "item": "minecraft:snowball", - "quantityRange": "1-2", - "percentage": 66 + "item": "minecraft:salmon", + "quantityRange": "1", + "percentage": 50 }, { - "item": "cobblemon:occa_berry", - "quantityRange": "1-2", - "percentage": 5 + "item": "cobblemon:wacan_berry", + "quantityRange": "1", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json index 004d8246a0..9e2a08fc5c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json @@ -8,6 +8,30 @@ "klutz", "h:limber" ], + "drops": { + "amount": "5", + "entries": [ + { + "item": "minecraft:rabbit" + }, + { + "item": "minecraft:rabbit_hide", + "percentage": 50 + }, + { + "item": "minecraft:rabbit_foot", + "percentage": 2.5 + }, + { + "item": "minecraft:carrot", + "percentage": 2.5 + }, + { + "item": "minecraft:chople_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 55, "attack": 66, @@ -26,23 +50,6 @@ "field", "human_like" ], - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:carrot", - "percentage": 50 - }, - { - "item": "minecraft:rabbit_hide", - "percentage": 5 - }, - { - "item": "minecraft:rabbit_foot", - "percentage": 2.5 - } - ] - }, "moves": [ "1:defensecurl", "1:foresight", 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 f73191857e..bd1bec8efa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json @@ -6,6 +6,19 @@ "shedskin", "h:overcoat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 29, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json index ed93ecceac..07ac53c92f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json @@ -7,11 +7,19 @@ "levitate" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 5 + }, { "item": "cobblemon:big_root", "percentage": 5 + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json index 320989a708..8eaf18ecc1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json @@ -10,15 +10,19 @@ "h:bigpecks" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { - "item": "minecraft:feather", + "item": "cobblemon:feather", "quantityRange": "1-2", "percentage": 66 }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 } ] }, 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 a309ad5450..5aa570e0f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -5,6 +5,19 @@ "abilities": [ "flowergift" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 60, 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 9770314aa4..da93484fe1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json @@ -5,6 +5,19 @@ "abilities": [ "chlorophyll" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 2.5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json index bffe3b4990..ec7886da9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json @@ -7,6 +7,15 @@ "blaze", "h:ironfist" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 44, "attack": 58, @@ -33,15 +42,6 @@ "field", "human_like" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:charcoal_stick", - "percentage": 5 - } - ] - }, "moves": [ "1:leer", "1:scratch", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/combee.json b/common/src/main/resources/data/cobblemon/species/generation4/combee.json index 48df85ed55..d5d48247b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/combee.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/combee.json @@ -9,11 +9,23 @@ "h:hustle" ], "drops": { - "amount": 1, + "amount": 4, "entries": [ { - "item": "minecraft:honeycomb", + "item": "minecraft:honey_bottle", "percentage": 50 + }, + { + "item": "minecraft:honeycomb", + "percentage": 2.5 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 2.5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json b/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json index 8f91762708..46ee3bf3ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json @@ -6,6 +6,15 @@ "moldbreaker", "h:sheerforce" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 67, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json b/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json index 781d5008cb..6631aaa66f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json @@ -8,6 +8,19 @@ "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, 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 1f8c07a0cb..76c658a95d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json @@ -5,6 +5,14 @@ "abilities": [ "baddreams" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:reaper_cloth" + } + ] + }, "baseStats": { "hp": 70, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json index 33853b360e..a65308718d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json @@ -8,6 +8,19 @@ "sniper", "h:keeneye" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:poison_barb", + "percentage": 5 + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json index 1d2c85b930..173e5e9bf1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json @@ -8,6 +8,15 @@ "unburden", "h:flareboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:kasib_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 150, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json b/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json index fcd4c8dab6..53735258c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json @@ -8,6 +8,15 @@ "unburden", "h:flareboost" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 90, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json index c554de1e27..d2e694c43a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json @@ -8,6 +8,23 @@ "torrent", "h:defiant" ], + "drops": { + "amount": "3", + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:mystic_water", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 84, "attack": 86, @@ -43,23 +60,6 @@ "light": "0-4" } }, - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "1-3", - "percentage": 75 - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:mystic_water", - "percentage": 20 - } - ] - }, "moves": [ "1:aquajet", "1:bubble", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json index 6ac5dc8671..1bc789d95f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json @@ -7,6 +7,22 @@ "stormdrain", "h:waterveil" ], + "drops": { + "amount": "3", + "entries": [ + { + "item": "minecraft:cod" + }, + { + "item": "minecraft:bonemeal", + "percentage": 5 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 49, "attack": 49, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json index 99772bc4fa..c87ac7a582 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json @@ -17,7 +17,6 @@ }, { "item": "cobblemon:wacan_berry", - "quantityRange": "1-2", "percentage": 5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json index 25c98edc3c..aedc5c22a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json @@ -8,6 +8,19 @@ "sandveil", "h:roughskin" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:dragon_fang", + "percentage": 5 + }, + { + "item": "cobblemon:haban_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 68, "attack": 90, @@ -26,15 +39,6 @@ "monster", "dragon" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 5 - } - ] - }, "moves": [ "1:dragonbreath", "1:dragonrage", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json index a58f29bf3b..cce9273601 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json @@ -8,6 +8,19 @@ "sandveil", "h:roughskin" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:dragon_fang", + "percentage": 10 + }, + { + "item": "cobblemon:haban_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 108, "attack": 130, @@ -85,15 +98,6 @@ "monster", "dragon" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 10 - } - ] - }, "moves": [ "1:crunch", "1:dragonbreath", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json index 2ecbc98d2f..b40f962615 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json @@ -8,6 +8,20 @@ "stormdrain", "h:sandforce" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "minecraft:clay_ball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 111, "attack": 83, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gible.json b/common/src/main/resources/data/cobblemon/species/generation4/gible.json index 639f3877b7..306e459cd4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gible.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gible.json @@ -8,6 +8,19 @@ "sandveil", "h:roughskin" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:dragon_fang", + "percentage": 2.5 + }, + { + "item": "cobblemon:haban_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 58, "attack": 70, @@ -26,15 +39,6 @@ "monster", "dragon" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 2.5 - } - ] - }, "moves": [ "1:sandtomb", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json index a5073583fb..df40fe3d19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json @@ -7,6 +7,15 @@ "owntempo", "h:keeneye" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 49, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json index 7611383c17..f074620d3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json @@ -7,6 +7,15 @@ "overgrow", "h:shellarmor" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 75, "attack": 89, @@ -36,15 +45,6 @@ "monster", "grass" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:miracle_seed", - "percentage": 10 - } - ] - }, "moves": [ "1:absorb", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json index 1f6b3fe502..34a5d19546 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json @@ -6,6 +6,19 @@ "sandstream", "h:sandforce" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:soft_sand", + "percentage": 2.5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 68, "attack": 72, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json index b9e3ae2977..856830ffc5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json @@ -6,6 +6,19 @@ "sandstream", "h:sandforce" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:soft_sand", + "percentage": 5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 108, "attack": 112, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json index a61da61d81..d328d94b47 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json @@ -8,6 +8,15 @@ "blaze", "h:ironfist" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 76, "attack": 104, @@ -34,15 +43,6 @@ "field", "human_like" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:charcoal_stick", - "percentage": 20 - } - ] - }, "moves": [ "1:closecombat", "1:ember", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json index 7b3b425b52..0c4fa25035 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json @@ -7,6 +7,15 @@ "shedskin", "h:runaway" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:coba_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 37, "attack": 25, @@ -32,15 +41,6 @@ "light": "0-4" } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:metronome", - "percentage": 2.5 - } - ] - }, "moves": [ "1:bide", "1:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json index 9f524cf379..07386a9f77 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json @@ -7,6 +7,15 @@ "swarm", "h:technician" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:coba_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 77, "attack": 85, @@ -37,15 +46,6 @@ "light": "0-4" } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:metronome", - "percentage": 5 - } - ] - }, "moves": [ "1:bide", "1:furycutter", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json index 8ce50fd2a1..1e9aa3aa71 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json @@ -8,6 +8,31 @@ "klutz", "h:limber" ], + "drops": { + "amount": "5", + "entries": [ + { + "item": "minecraft:rabbit" + }, + { + "item": "minecraft:rabbit_hide", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:rabbit_foot", + "percentage": 5 + }, + { + "item": "minecraft:carrot", + "percentage": 5 + }, + { + "item": "minecraft:chople_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 76, @@ -74,24 +99,6 @@ "field", "human_like" ], - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:carrot", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "minecraft:rabbit_hide", - "percentage": 10 - }, - { - "item": "minecraft:rabbit_foot", - "percentage": 5 - } - ] - }, "moves": [ "1:babydolleyes", "1:bounce", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index 285ff84195..2f19a0afd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -9,6 +9,15 @@ "innerfocus", "h:justified" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:chople_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index b7f2b813e8..76c136ed8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json @@ -7,6 +7,22 @@ "stormdrain", "h:waterveil" ], + "drops": { + "amount": "3", + "entries": [ + { + "item": "cobblemon:cod" + }, + { + "item": "cobblemon:bonemeal", + "percentage": 10 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 69, "attack": 69, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json index f6a46a7379..ee81776e4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json @@ -9,11 +9,15 @@ "h:guts" ], "drops": { - "amount": 1, + "amount": "2", "entries": [ { "item": "cobblemon:quick_claw", "percentage": 5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index 4c448b649e..3f4a14d350 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -9,11 +9,15 @@ "h:guts" ], "drops": { - "amount": 1, + "amount": "2", "entries": [ { "item": "cobblemon:quick_claw", "percentage": 10 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json index 9777eb2334..5aadb3ee89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json @@ -8,6 +8,15 @@ "blaze", "h:ironfist" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 64, "attack": 78, @@ -34,15 +43,6 @@ "field", "human_like" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:charcoal_stick", - "percentage": 10 - } - ] - }, "moves": [ "1:ember", "1:leer", 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 449a259cad..a2597c7709 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -7,6 +7,19 @@ "swarm", "h:tintedlens" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:silver_powder", + "percentage": 5 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 94, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json index 80ddafb76e..f1a2fc55af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -13,7 +13,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 2.5 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json index 8e044b821f..059caa5b51 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json @@ -7,6 +7,22 @@ "torrent", "h:defiant" ], + "drops": { + "amount": "3", + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:mystic_water", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 53, "attack": 51, @@ -42,22 +58,6 @@ "light": "0-4" } }, - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:feather", - "percentage": 50 - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:mystic_water", - "percentage": 5 - } - ] - }, "moves": [ "1:pound", "4:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json index 838b912fad..144aac3097 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json @@ -7,6 +7,23 @@ "torrent", "h:defiant" ], + "drops": { + "amount": "3", + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:mystic_water", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 64, "attack": 66, @@ -42,23 +59,6 @@ "light": "0-4" } }, - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:mystic_water", - "percentage": 10 - } - ] - }, "moves": [ "1:bubble", "1:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json index 65d6bcb8a7..2e69ef2bfd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -7,6 +7,15 @@ "owntempo", "h:defiant" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 71, "attack": 82, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json index 8b8a00ebb8..6fbc189a42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json @@ -6,6 +6,16 @@ "moldbreaker", "h:sheerforce" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 97, "attack": 165, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json index db14c4b639..3ab5cf7d43 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json @@ -8,6 +8,15 @@ "innerfocus", "h:prankster" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:chople_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json index c42d00d7c1..694c265336 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json @@ -7,6 +7,19 @@ "stormdrain", "h:sandforce" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 50 + }, + { + "item": "minecraft:rindo_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 76, "attack": 48, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json index 9a37829d7c..66ad4308b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json @@ -7,6 +7,15 @@ "sturdy", "h:soundproof" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 30, "attack": 42, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json index 13d4758295..cc16cbf483 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json @@ -9,15 +9,18 @@ "h:guts" ], "drops": { - "amount": 1, + "amount": "2", "entries": [ { "item": "cobblemon:quick_claw", "percentage": 2.5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 45, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json index b7d43d1a85..a4ee88967e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json @@ -8,6 +8,19 @@ "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, 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 e17688f3ee..692ae0209a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -8,6 +8,15 @@ "aftermath", "h:keeneye" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:pecha_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 103, "attack": 93, 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 e395f4d721..6672e04670 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/snover.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/snover.json @@ -7,6 +7,23 @@ "snowwarning", "h:soundproof" ], + "drops": { + "amount": "3", + "entries": [ + { + "item": "minecraft:snowball", + "percentage": 50 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 2.5 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 62, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json index da2bd9948c..94daec7f66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -8,6 +8,15 @@ "pressure", "h:infiltrator" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 50, "attack": 92, @@ -25,15 +34,6 @@ "eggGroups": [ "amorphous" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:spell_tag", - "percentage": 10 - } - ] - }, "moves": [ "1:confuseray", "1:curse", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json index 7ba592abbd..2b5e4669a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json @@ -25,7 +25,6 @@ }, { "item": "cobblemon:yache_berry", - "quantityRange": "1-3", "percentage": 10 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json index 68a249ad42..2f5abfb264 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json @@ -25,7 +25,6 @@ }, { "item": "cobblemon:yache_berry", - "quantityRange": "1-2", "percentage": 5 } ] 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 0500fb6455..9773346ccb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json @@ -8,6 +8,15 @@ "aftermath", "h:keeneye" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 63, "attack": 63, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json index 3553cdc681..f684d27f24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json @@ -8,6 +8,15 @@ "overgrow", "h:shellarmor" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 95, "attack": 109, @@ -26,15 +35,6 @@ "monster", "grass" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:miracle_seed", - "percentage": 20 - } - ] - }, "behaviour": { "resting": { "canSleep": true, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json index 181b3693b2..a7892644b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -8,6 +8,19 @@ "dryskin", "h:poisontouch" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:black_sludge", + "percentage": 5 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 83, "attack": 106, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json index 852974599e..649242e241 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json @@ -7,6 +7,15 @@ "overgrow", "h:shellarmor" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 55, "attack": 68, @@ -36,15 +45,6 @@ "monster", "grass" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:miracle_seed", - "percentage": 5 - } - ] - }, "moves": [ "1:tackle", "5:withdraw", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json index cd2bfd2700..ca244f3774 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json @@ -9,12 +9,24 @@ "h:unnerve" ], "drops": { - "amount": 1, + "amount": 4, "entries": [ { - "item": "minecraft:honeycomb", + "item": "minecraft:honey_bottle", "quantityRange": "1-3", "percentage": 75 + }, + { + "item": "minecraft:honey_comb", + "percentage": 10 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 10 + }, + { + "item": "cobblemont:charti_berry", + "percentage": 10 } ] }, 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 5d80d93d7b..4cbccc5f80 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json @@ -7,6 +7,20 @@ "anticipation", "h:overcoat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:occa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 59, From 7ac41e2f6815e162e6ffcafd238f851c4d6ecc35 Mon Sep 17 00:00:00 2001 From: miasmus <15349355-miasmusa@users.noreply.gitlab.com> Date: Sat, 7 Oct 2023 19:56:05 -0400 Subject: [PATCH 25/40] rearrange some json to be more consistent (gen 4) --- .../species/generation4/electivire.json | 34 +++++++------- .../species/generation4/lickilicky.json | 20 ++++----- .../species/generation4/magmortar.json | 34 +++++++------- .../species/generation4/magnezone.json | 44 +++++++++---------- .../species/generation4/mamoswine.json | 26 +++++------ .../cobblemon/species/generation4/mimejr.json | 18 ++++---- .../species/generation4/mismagius.json | 18 ++++---- .../species/generation4/munchlax.json | 34 +++++++------- .../species/generation4/porygonz.json | 18 ++++---- .../species/generation4/rhyperior.json | 26 +++++------ .../species/generation4/tangrowth.json | 28 ++++++------ .../species/generation4/weavile.json | 26 +++++------ 12 files changed, 163 insertions(+), 163 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json index 406dd604d4..e0169e5b5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json @@ -7,23 +7,6 @@ "motordrive", "h:vitalspirit" ], - "baseStats": { - "hp": 75, - "attack": 123, - "defence": 67, - "special_attack": 95, - "special_defence": 85, - "speed": 95 - }, - "catchRate": 30, - "maleRatio": 0.75, - "shoulderMountable": false, - "baseExperienceYield": 270, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], "drops": { "amount": 3, "entries": [ @@ -42,6 +25,23 @@ } ] }, + "baseStats": { + "hp": 75, + "attack": 123, + "defence": 67, + "special_attack": 95, + "special_defence": 85, + "speed": 95 + }, + "catchRate": 30, + "maleRatio": 0.75, + "shoulderMountable": false, + "baseExperienceYield": 270, + "experienceGroup": "medium_fast", + "eggCycles": 25, + "eggGroups": [ + "human_like" + ], "moves": [ "1:charge", "1:electricterrain", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json index d2edcf6153..a7a5257f5b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json @@ -8,6 +8,16 @@ "oblivious", "h:cloudnine" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "minecraft:slime_ball", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 110, "attack": 85, @@ -32,16 +42,6 @@ "eggGroups": [ "monster" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "1-2", - "percentage": 66 - } - ] - }, "moves": [ "1:defensecurl", "1:lick", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json index cb18882c8c..c277ac5f27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -7,23 +7,6 @@ "flamebody", "h:vitalspirit" ], - "baseStats": { - "hp": 75, - "attack": 95, - "defence": 67, - "special_attack": 125, - "special_defence": 95, - "speed": 83 - }, - "catchRate": 30, - "maleRatio": 0.75, - "shoulderMountable": false, - "baseExperienceYield": 270, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], "drops": { "amount": 3, "entries": [ @@ -41,6 +24,23 @@ } ] }, + "baseStats": { + "hp": 75, + "attack": 95, + "defence": 67, + "special_attack": 125, + "special_defence": 95, + "speed": 83 + }, + "catchRate": 30, + "maleRatio": 0.75, + "shoulderMountable": false, + "baseExperienceYield": 270, + "experienceGroup": "medium_fast", + "eggCycles": 25, + "eggGroups": [ + "human_like" + ], "moves": [ "1:ember", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json index f04cdb4420..94341962f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json @@ -9,6 +9,28 @@ "sturdy", "h:analytic" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:raw_iron", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:magnet", + "percentage": 10 + }, + { + "item": "cobblemon:metal_coat", + "percentage": 10 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 70, "attack": 70, @@ -36,28 +58,6 @@ } } }, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:raw_iron", - "quantityRange": "1-3", - "percentage": 75 - }, - { - "item": "cobblemon:magnet", - "percentage": 10 - }, - { - "item": "cobblemon:metal_coat", - "percentage": 10 - }, - { - "item": "cobblemon:shuca_berry", - "percentage": 10 - } - ] - }, "moves": [ "1:barrier", "1:electricterrain", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index db7f1640d7..dd94c81a59 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -9,6 +9,19 @@ "snowcloak", "h:thickfat" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "minecraft:porkchop", + "quantityRange": "2-3" + }, + { + "item": "minecraft:brown_wool", + "quantityRange": "2-3" + } + ] + }, "baseStats": { "hp": 110, "attack": 130, @@ -34,19 +47,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "2-3" - }, - { - "item": "minecraft:brown_wool", - "quantityRange": "2-3" - } - ] - }, "moves": [ "1:ancientpower", "1:flail", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index 21bdeb6864..9dd40540ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -9,6 +9,15 @@ "filter", "h:technician" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:light_clay", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 20, "attack": 25, @@ -26,15 +35,6 @@ "eggGroups": [ "undiscovered" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:light_clay", - "percentage": 2.5 - } - ] - }, "moves": [ "1:barrier", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index e70e0620a2..673352eeb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -6,6 +6,15 @@ "abilities": [ "levitate" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:spell_tag", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 60, "attack": 60, @@ -23,15 +32,6 @@ "eggGroups": [ "amorphous" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:spell_tag", - "percentage": 10 - } - ] - }, "moves": [ "1:astonish", "1:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json index 06eb4043a5..8ae0be8966 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json @@ -8,23 +8,6 @@ "thickfat", "h:gluttony" ], - "baseStats": { - "hp": 135, - "attack": 85, - "defence": 40, - "special_attack": 40, - "special_defence": 85, - "speed": 5 - }, - "catchRate": 50, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 78, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "undiscovered" - ], "drops": { "amount": 3, "entries": [ @@ -43,6 +26,23 @@ } ] }, + "baseStats": { + "hp": 135, + "attack": 85, + "defence": 40, + "special_attack": 40, + "special_defence": 85, + "speed": 5 + }, + "catchRate": 50, + "maleRatio": 0.875, + "shoulderMountable": false, + "baseExperienceYield": 78, + "experienceGroup": "slow", + "eggCycles": 40, + "eggGroups": [ + "undiscovered" + ], "moves": [ "1:lastresort", "1:lick", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json index 214b3effc8..671962bbb6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json @@ -8,6 +8,15 @@ "download", "h:analytic" ], + "drops": { + "amount": "1", + "entries": [ + { + "item": "cobblemon:dubious_disc", + "percentage": 20 + } + ] + }, "baseStats": { "hp": 85, "attack": 80, @@ -35,15 +44,6 @@ } } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:dubious_disc", - "percentage": 20 - } - ] - }, "moves": [ "1:conversion2", "1:conversion", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json index 67b5f77c86..08f883b7ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json @@ -9,6 +9,19 @@ "solidrock", "h:reckless" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:protector", + "percentage": 10 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 115, "attack": 140, @@ -27,19 +40,6 @@ "monster", "field" ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:protector", - "percentage": 10 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 10 - } - ] - }, "moves": [ "1:bulldoze", "1:furyattack", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json index 7f3a60905e..29c06340eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json @@ -8,6 +8,20 @@ "leafguard", "h:regenerator" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "minecraft:vines", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:big_root", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 100, "attack": 100, @@ -25,20 +39,6 @@ "eggGroups": [ "grass" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:vines", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "cobblemon:big_root", - "percentage": 5 - } - ] - }, "moves": [ "1:absorb", "1:bind", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index 9fe2123811..87f999b5e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -8,6 +8,19 @@ "pressure", "h:pickpocket" ], + "drops": { + "amount": "2", + "entries": [ + { + "item": "cobblemon:razor_claw", + "percentage": 10 + }, + { + "item": "cobblemon:quick_claw", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 70, "attack": 120, @@ -25,19 +38,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "cobblemon:razor_claw", - "percentage": 10 - }, - { - "item": "cobblemon:quick_claw", - "percentage": 10 - } - ] - }, "moves": [ "1:agility", "1:assurance", From 9da04597937652530620cd0b82284a777afc468a Mon Sep 17 00:00:00 2001 From: miasmus <15349355-miasmusa@users.noreply.gitlab.com> Date: Sat, 7 Oct 2023 20:20:16 -0400 Subject: [PATCH 26/40] its not bonemeal its bone_meal silly --- .../resources/data/cobblemon/species/generation4/finneon.json | 2 +- .../resources/data/cobblemon/species/generation4/lumineon.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json index 1bc789d95f..756c907459 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json @@ -14,7 +14,7 @@ "item": "minecraft:cod" }, { - "item": "minecraft:bonemeal", + "item": "minecraft:bone_meal", "percentage": 5 }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index 76c136ed8e..d093f4b253 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json @@ -14,7 +14,7 @@ "item": "cobblemon:cod" }, { - "item": "cobblemon:bonemeal", + "item": "cobblemon:bone_meal", "percentage": 10 }, { From a7fed0d042a8c8cc4bc463ceabe157d5438d6c2d Mon Sep 17 00:00:00 2001 From: miasmus <15349355-miasmusa@users.noreply.gitlab.com> Date: Sun, 8 Oct 2023 18:38:57 -0400 Subject: [PATCH 27/40] gen 5 drops, edits for consistency --- .../species/generation1/bulbasaur.json | 2 +- .../species/generation1/charmander.json | 2 +- .../species/generation1/charmeleon.json | 2 +- .../species/generation1/clefable.json | 2 +- .../species/generation1/clefairy.json | 2 +- .../cobblemon/species/generation1/dodrio.json | 2 +- .../cobblemon/species/generation1/doduo.json | 2 +- .../cobblemon/species/generation1/ekans.json | 2 +- .../species/generation1/electrode.json | 2 +- .../cobblemon/species/generation1/grimer.json | 2 +- .../species/generation1/hitmonchan.json | 2 +- .../species/generation1/hitmonlee.json | 2 +- .../cobblemon/species/generation1/horsea.json | 2 +- .../species/generation1/ivysaur.json | 2 +- .../cobblemon/species/generation1/kabuto.json | 2 +- .../species/generation1/kabutops.json | 2 +- .../species/generation1/kadabra.json | 2 +- .../cobblemon/species/generation1/kakuna.json | 2 +- .../species/generation1/kingler.json | 2 +- .../cobblemon/species/generation1/krabby.json | 2 +- .../species/generation1/lickitung.json | 2 +- .../species/generation1/marowak.json | 2 +- .../cobblemon/species/generation1/meowth.json | 2 +- .../species/generation1/metapod.json | 2 +- .../cobblemon/species/generation1/muk.json | 2 +- .../species/generation1/ninetales.json | 2 +- .../species/generation1/omanyte.json | 2 +- .../species/generation1/omastar.json | 2 +- .../species/generation1/pidgeot.json | 2 +- .../species/generation1/pidgeotto.json | 2 +- .../cobblemon/species/generation1/pidgey.json | 2 +- .../cobblemon/species/generation1/rhydon.json | 2 +- .../species/generation1/rhyhorn.json | 2 +- .../cobblemon/species/generation1/seadra.json | 2 +- .../species/generation1/snorlax.json | 2 +- .../species/generation1/squirtle.json | 2 +- .../species/generation1/tangela.json | 2 +- .../cobblemon/species/generation1/tauros.json | 2 +- .../species/generation1/venusaur.json | 2 +- .../species/generation1/victreebel.json | 2 +- .../species/generation1/voltorb.json | 2 +- .../cobblemon/species/generation1/vulpix.json | 2 +- .../species/generation1/wartortle.json | 2 +- .../cobblemon/species/generation1/weedle.json | 2 +- .../species/generation1/weepinbell.json | 2 +- .../species/generation2/bayleef.json | 2 +- .../species/generation2/blissey.json | 2 +- .../species/generation2/chikorita.json | 2 +- .../cobblemon/species/generation2/cleffa.json | 2 +- .../species/generation2/forretress.json | 2 +- .../species/generation2/hitmontop.json | 2 +- .../species/generation2/kingdra.json | 2 +- .../cobblemon/species/generation2/natu.json | 2 +- .../species/generation2/politoed.json | 2 +- .../species/generation2/porygon2.json | 2 +- .../cobblemon/species/generation2/scizor.json | 2 +- .../species/generation2/sneasel.json | 2 +- .../species/generation2/tyrogue.json | 2 +- .../species/generation3/blaziken.json | 2 +- .../species/generation3/combusken.json | 2 +- .../species/generation3/grovyle.json | 2 +- .../species/generation3/luvdisc.json | 2 +- .../species/generation3/marshtomp.json | 2 +- .../cobblemon/species/generation3/mudkip.json | 2 +- .../species/generation3/sceptile.json | 2 +- .../species/generation3/swampert.json | 2 +- .../species/generation3/torchic.json | 2 +- .../species/generation3/treecko.json | 2 +- .../species/generation4/buneary.json | 2 +- .../species/generation4/chimchar.json | 2 +- .../species/generation4/empoleon.json | 2 +- .../species/generation4/finneon.json | 2 +- .../cobblemon/species/generation4/gabite.json | 2 +- .../species/generation4/garchomp.json | 2 +- .../species/generation4/gastrodon.json | 2 +- .../cobblemon/species/generation4/gible.json | 2 +- .../species/generation4/glameow.json | 2 +- .../cobblemon/species/generation4/grotle.json | 2 +- .../species/generation4/happiny.json | 2 +- .../species/generation4/hippopotas.json | 2 +- .../species/generation4/hippowdon.json | 2 +- .../species/generation4/honchkrow.json | 2 +- .../species/generation4/infernape.json | 2 +- .../species/generation4/kricketot.json | 2 +- .../species/generation4/kricketune.json | 2 +- .../species/generation4/lickilicky.json | 2 +- .../species/generation4/lopunny.json | 2 +- .../species/generation4/lucario.json | 2 +- .../species/generation4/lumineon.json | 2 +- .../cobblemon/species/generation4/luxio.json | 2 +- .../cobblemon/species/generation4/luxray.json | 2 +- .../species/generation4/mamoswine.json | 2 +- .../cobblemon/species/generation4/mimejr.json | 2 +- .../species/generation4/mismagius.json | 2 +- .../species/generation4/monferno.json | 2 +- .../cobblemon/species/generation4/mothim.json | 2 +- .../cobblemon/species/generation4/piplup.json | 2 +- .../species/generation4/porygonz.json | 2 +- .../species/generation4/prinplup.json | 2 +- .../species/generation4/purugly.json | 2 +- .../species/generation4/rampardos.json | 2 +- .../cobblemon/species/generation4/riolu.json | 2 +- .../species/generation4/shellos.json | 2 +- .../species/generation4/shieldon.json | 2 +- .../cobblemon/species/generation4/shinx.json | 2 +- .../species/generation4/skorupi.json | 2 +- .../species/generation4/skuntank.json | 2 +- .../cobblemon/species/generation4/snover.json | 2 +- .../species/generation4/spiritomb.json | 2 +- .../cobblemon/species/generation4/stunky.json | 2 +- .../species/generation4/tangrowth.json | 2 +- .../species/generation4/torterra.json | 2 +- .../species/generation4/toxicroak.json | 2 +- .../species/generation4/turtwig.json | 2 +- .../species/generation4/weavile.json | 2 +- .../species/generation5/amoonguss.json | 14 +++++++ .../cobblemon/species/generation5/archen.json | 10 +++++ .../species/generation5/archeops.json | 10 +++++ .../cobblemon/species/generation5/audino.json | 9 ++++ .../cobblemon/species/generation5/axew.json | 13 ++++++ .../species/generation5/basculin.json | 24 +++++------ .../species/generation5/beartic.json | 19 +++++++++ .../species/generation5/beheeyem.json | 42 ++++++++++--------- .../species/generation5/bisharp.json | 13 ++++++ .../species/generation5/blitzle.json | 13 ++++++ .../species/generation5/boldore.json | 4 +- .../species/generation5/bouffalant.json | 15 +++++-- .../species/generation5/braviary.json | 21 ++++++++++ .../species/generation5/carracosta.json | 10 +++++ .../species/generation5/chandelure.json | 17 ++++++++ .../species/generation5/cinccino.json | 13 ++++++ .../species/generation5/cobalion.json | 8 ++++ .../species/generation5/conkeldurr.json | 7 +++- .../species/generation5/cottonee.json | 6 ++- .../species/generation5/crustle.json | 1 - .../species/generation5/cryogonal.json | 22 ++++++---- .../species/generation5/cubchoo.json | 17 ++++++++ .../species/generation5/darmanitan.json | 9 ++++ .../species/generation5/darumaka.json | 9 ++++ .../species/generation5/deerling.json | 22 ++++++---- .../cobblemon/species/generation5/deino.json | 13 ++++++ .../cobblemon/species/generation5/dewott.json | 27 ++++++------ .../species/generation5/drilbur.json | 13 ++++++ .../species/generation5/druddigon.json | 13 ++++++ .../species/generation5/ducklett.json | 16 +++++++ .../species/generation5/duosion.json | 14 +++++++ .../cobblemon/species/generation5/durant.json | 22 ++++++---- .../species/generation5/dwebble.json | 8 +--- .../species/generation5/eelektrik.json | 10 +++++ .../species/generation5/eelektross.json | 10 +++++ .../cobblemon/species/generation5/elgyem.json | 38 +++++++++-------- .../cobblemon/species/generation5/emboar.json | 26 ++++++------ .../cobblemon/species/generation5/emolga.json | 5 +-- .../species/generation5/escavalier.json | 13 ++++++ .../species/generation5/excadrill.json | 13 ++++++ .../species/generation5/ferroseed.json | 13 ++++++ .../species/generation5/ferrothorn.json | 14 +++++++ .../species/generation5/foongus.json | 13 ++++++ .../species/generation5/fraxure.json | 13 ++++++ .../species/generation5/frillish.json | 13 ++++++ .../species/generation5/galvantula.json | 39 ++++++++++------- .../species/generation5/garbodor.json | 21 ++++++++++ .../cobblemon/species/generation5/golett.json | 7 +++- .../cobblemon/species/generation5/golurk.json | 11 +++-- .../species/generation5/gothita.json | 7 +++- .../species/generation5/gothitelle.json | 7 +++- .../species/generation5/gothorita.json | 7 +++- .../species/generation5/gurdurr.json | 7 +++- .../species/generation5/haxorus.json | 13 ++++++ .../species/generation5/heatmor.json | 22 ++++++---- .../species/generation5/herdier.json | 11 +++-- .../species/generation5/hydreigon.json | 14 +++++++ .../species/generation5/jellicent.json | 14 +++++++ .../cobblemon/species/generation5/joltik.json | 34 +++++++++------ .../species/generation5/karrablast.json | 9 ++++ .../cobblemon/species/generation5/klang.json | 20 ++++----- .../cobblemon/species/generation5/klink.json | 18 ++++---- .../species/generation5/klinklang.json | 20 ++++----- .../species/generation5/krokorok.json | 13 ++++++ .../species/generation5/krookodile.json | 13 ++++++ .../species/generation5/lampent.json | 16 +++++++ .../species/generation5/larvesta.json | 21 ++++++++++ .../species/generation5/leavanny.json | 22 ++++++++++ .../species/generation5/liepard.json | 14 +++++++ .../species/generation5/lilligant.json | 17 ++++++++ .../species/generation5/lillipup.json | 7 +++- .../species/generation5/litwick.json | 16 +++++++ .../species/generation5/mandibuzz.json | 26 ++++++++++++ .../species/generation5/maractus.json | 9 ++-- .../species/generation5/mienfoo.json | 9 ++++ .../species/generation5/mienshao.json | 9 ++++ .../species/generation5/minccino.json | 13 ++++++ .../cobblemon/species/generation5/munna.json | 9 ++++ .../species/generation5/musharna.json | 9 ++++ .../species/generation5/oshawott.json | 26 ++++++------ .../species/generation5/palpitoad.json | 14 +++++++ .../species/generation5/panpour.json | 17 ++++++++ .../species/generation5/pansage.json | 17 ++++++++ .../species/generation5/pansear.json | 17 ++++++++ .../cobblemon/species/generation5/patrat.json | 3 +- .../species/generation5/pawniard.json | 13 ++++++ .../species/generation5/petilil.json | 17 ++++++++ .../cobblemon/species/generation5/pidove.json | 7 +++- .../species/generation5/pignite.json | 28 ++++++------- .../species/generation5/purrloin.json | 13 ++++++ .../species/generation5/reuniclus.json | 14 +++++++ .../species/generation5/roggenrola.json | 1 - .../species/generation5/rufflet.json | 16 +++++++ .../species/generation5/samurott.json | 11 +++-- .../species/generation5/sandile.json | 14 +++++++ .../cobblemon/species/generation5/sawk.json | 14 +++++++ .../species/generation5/sawsbuck.json | 24 ++++++----- .../species/generation5/scolipede.json | 7 +++- .../species/generation5/scrafty.json | 13 ++++++ .../species/generation5/scraggy.json | 13 ++++++ .../species/generation5/seismitoad.json | 14 +++++++ .../species/generation5/serperior.json | 2 +- .../species/generation5/servine.json | 18 ++++---- .../species/generation5/sewaddle.json | 21 ++++++++++ .../species/generation5/shelmet.json | 9 ++++ .../species/generation5/sigilyph.json | 22 ++++++---- .../species/generation5/simipour.json | 17 ++++++++ .../species/generation5/simisage.json | 17 ++++++++ .../species/generation5/simisear.json | 17 ++++++++ .../cobblemon/species/generation5/snivy.json | 18 ++++---- .../species/generation5/solosis.json | 13 ++++++ .../species/generation5/stoutland.json | 11 +++-- .../species/generation5/stunfisk.json | 14 +++++++ .../species/generation5/swadloon.json | 22 ++++++++++ .../cobblemon/species/generation5/swanna.json | 21 ++++++++++ .../species/generation5/swoobat.json | 13 ++++++ .../cobblemon/species/generation5/tepig.json | 27 ++++++------ .../species/generation5/terrakion.json | 8 ++++ .../cobblemon/species/generation5/throh.json | 13 ++++++ .../species/generation5/timburr.json | 7 +++- .../species/generation5/tirtouga.json | 10 +++++ .../species/generation5/tranquill.json | 11 +++-- .../species/generation5/trubbish.json | 21 ++++++++++ .../species/generation5/tympole.json | 13 ++++++ .../cobblemon/species/generation5/tynamo.json | 9 ++++ .../species/generation5/unfezant.json | 7 +++- .../species/generation5/vanillish.json | 18 ++++++++ .../species/generation5/vanillite.json | 17 ++++++++ .../species/generation5/vanilluxe.json | 18 ++++++++ .../species/generation5/venipede.json | 9 ++-- .../species/generation5/virizion.json | 8 ++++ .../species/generation5/volcarona.json | 17 ++++++++ .../species/generation5/vullaby.json | 20 +++++++++ .../species/generation5/watchog.json | 6 +-- .../species/generation5/whimsicott.json | 7 +++- .../species/generation5/whirlipede.json | 7 +++- .../cobblemon/species/generation5/woobat.json | 12 ++++++ .../cobblemon/species/generation5/yamask.json | 1 - .../species/generation5/zebstrika.json | 14 +++++++ .../species/generation5/zoroark.json | 13 ++++++ .../cobblemon/species/generation5/zorua.json | 13 ++++++ .../species/generation5/zweilous.json | 14 +++++++ .../species/generation6/aegislash.json | 2 +- .../species/generation6/braixen.json | 2 +- .../species/generation6/chesnaught.json | 2 +- .../species/generation6/chespin.json | 2 +- .../species/generation6/delphox.json | 2 +- .../species/generation6/doublade.json | 2 +- .../species/generation6/fennekin.json | 2 +- .../species/generation6/froakie.json | 2 +- .../species/generation6/frogadier.json | 2 +- .../species/generation6/gourgeist.json | 2 +- .../species/generation6/honedge.json | 2 +- .../species/generation6/pumpkaboo.json | 2 +- .../species/generation6/quilladin.json | 2 +- .../species/generation7/dartrix.json | 2 +- .../species/generation7/decidueye.json | 2 +- .../species/generation7/dhelmise.json | 2 +- .../species/generation7/incineroar.json | 2 +- .../cobblemon/species/generation7/litten.json | 2 +- .../species/generation7/popplio.json | 2 +- .../species/generation7/primarina.json | 2 +- .../species/generation7/pyukumuku.json | 2 +- .../cobblemon/species/generation7/rowlet.json | 2 +- .../species/generation7/torracat.json | 2 +- .../species/generation8/alcremie.json | 2 +- .../species/generation8/centiskorch.json | 2 +- .../species/generation8/cinderace.json | 2 +- .../species/generation8/drizzile.json | 2 +- .../species/generation8/dubwool.json | 2 +- .../cobblemon/species/generation8/eiscue.json | 2 +- .../species/generation8/grookey.json | 2 +- .../species/generation8/inteleon.json | 2 +- .../species/generation8/kleavor.json | 2 +- .../species/generation8/milcery.json | 2 +- .../cobblemon/species/generation8/raboot.json | 2 +- .../species/generation8/rillaboom.json | 2 +- .../species/generation8/scorbunny.json | 2 +- .../species/generation8/sizzlipede.json | 2 +- .../cobblemon/species/generation8/sobble.json | 2 +- .../species/generation8/thwackey.json | 2 +- .../cobblemon/species/generation8/wooloo.json | 2 +- .../species/generation8/wyrdeer.json | 2 +- .../species/generation9/garganacl.json | 2 +- .../cobblemon/species/generation9/nacli.json | 2 +- .../species/generation9/naclstack.json | 2 +- .../species/generation9/tatsugiri.json | 2 +- .../com/cobblemon/mod/forge/CobblemonForge.kt | 1 - 303 files changed, 1859 insertions(+), 489 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json index b4ad9d7c5e..ace96154e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json @@ -35,7 +35,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:melon_seeds", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json index 165cc1f064..0cc0e875a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json @@ -39,7 +39,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:blaze_powder", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json index f8a6c01468..0e7f20a534 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json @@ -38,7 +38,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:blaze_powder", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json index 1027efe756..2c484a9fd2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json @@ -34,7 +34,7 @@ "fairy" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:moon_stone", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json index 72a661bb27..3c61389c8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json @@ -34,7 +34,7 @@ "fairy" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:moon_stone", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json index 04c1106caf..9526acf89c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json @@ -27,7 +27,7 @@ "flying" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/doduo.json b/common/src/main/resources/data/cobblemon/species/generation1/doduo.json index 558e035939..cf3b6f89ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/doduo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/doduo.json @@ -27,7 +27,7 @@ "flying" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json index 4c36143749..9880820d6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json @@ -38,7 +38,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:razor_fang", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json index 207f005115..f4e1771af0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json @@ -129,7 +129,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:gunpowder", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json index ffc5ee3e54..50f422885f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json @@ -232,7 +232,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:slime_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json index d248f68712..1b1584267f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json @@ -35,7 +35,7 @@ }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:black_belt", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json index 693dd81075..2e8f4a7d87 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json @@ -35,7 +35,7 @@ }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:black_belt", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/horsea.json b/common/src/main/resources/data/cobblemon/species/generation1/horsea.json index 606fb37625..16796a13e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/horsea.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/horsea.json @@ -35,7 +35,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:prismarine_shard", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json index f3699705ec..e3159f21c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json @@ -34,7 +34,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:melon_seeds", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json index d955998172..7f38325151 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json @@ -36,7 +36,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:scute", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json index 59483a4852..511426af64 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json @@ -36,7 +36,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:scute", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json index 7390d7527f..c225929d46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json @@ -34,7 +34,7 @@ "human_like" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:ender_pearl", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json b/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json index 7f3fee7f97..42db34f4d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json @@ -41,7 +41,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:string", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json index 982858b901..377a3b6b22 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json @@ -83,7 +83,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:kings_rock", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/krabby.json b/common/src/main/resources/data/cobblemon/species/generation1/krabby.json index 6355c3ee7d..d2322704e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/krabby.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/krabby.json @@ -35,7 +35,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:kings_rock", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json b/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json index 341140d1ca..0138d79652 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json @@ -33,7 +33,7 @@ "monster" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:slime_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json index 4e3d756e7a..1fa19d4646 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json @@ -366,7 +366,7 @@ "monster" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:bone" diff --git a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json index 8cb9b1b8ae..6d5ed3c748 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json @@ -438,7 +438,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:gold_nugget", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/metapod.json b/common/src/main/resources/data/cobblemon/species/generation1/metapod.json index 8d1e3dd2d7..dd3444c6c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/metapod.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/metapod.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:string", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/muk.json b/common/src/main/resources/data/cobblemon/species/generation1/muk.json index 21d89a70b6..0fde340e63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/muk.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/muk.json @@ -216,7 +216,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:slime_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json index 9c2932e69f..2e1c7656f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json @@ -194,7 +194,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:sweet_berries", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json index c5b8687162..33b2d8845c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json @@ -36,7 +36,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:nautilus_shell" diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json index dcc27f6ac5..ebc7e9a477 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json @@ -36,7 +36,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:nautilus_shell" diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json index 982ba558e9..ba9fa6bab7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json @@ -92,7 +92,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json index 7f4340e7b9..d40bdf58b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json @@ -40,7 +40,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json index 9c01c3c244..c5154717ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json @@ -40,7 +40,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json index 4a84578158..13f7cf37fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json @@ -28,7 +28,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:protector", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json index 1547d1331e..1d72155305 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json @@ -28,7 +28,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:protector", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json index b6e1bc00b7..6cfbe00f79 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json @@ -35,7 +35,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:prismarine_shard", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json index f07c8ab472..af2976038f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -74,7 +74,7 @@ "monster" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:apple", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json index 48ed74f209..a0ccd03925 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json @@ -45,7 +45,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:scute", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json index 6eee1ea7a2..0c782f4854 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json @@ -26,7 +26,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:vines", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json index ec9ddf979c..d35b72463a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json @@ -336,7 +336,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:leather", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index 5a5692958d..58ab54c65f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -134,7 +134,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:melon_seeds", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json index dc2ff6345a..e17c4b3585 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json @@ -26,7 +26,7 @@ "grass" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:big_root", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json index 64b0251a02..0d68338294 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json @@ -140,7 +140,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:gunpowder", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json index 86fe9c6196..306acb7267 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json @@ -212,7 +212,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:sweet_berries", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json index 36227cc963..133aa1002d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json @@ -26,7 +26,7 @@ "water_1" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:scute", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weedle.json b/common/src/main/resources/data/cobblemon/species/generation1/weedle.json index 62d4a11e6d..7563a8549b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weedle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weedle.json @@ -38,7 +38,7 @@ "bug" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:string", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json index 3215f9e3e5..fdbec405fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json @@ -26,7 +26,7 @@ "grass" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:big_root", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json index e04b43e0f7..e425b757e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json @@ -39,7 +39,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json index 32087a0c9d..2e7c6c4527 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json @@ -26,7 +26,7 @@ "fairy" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:lucky_egg", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json index e29f02d349..4554628d92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json @@ -39,7 +39,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json index 28d0a2c318..d844c039cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json @@ -26,7 +26,7 @@ "undiscovered" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:moon_stone", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json index be96165604..c2d06339ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json @@ -37,7 +37,7 @@ "bug" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:string", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json index 6b7d02389e..621cd8c31d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json @@ -26,7 +26,7 @@ "human_like" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:black_belt", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json index ca3340a2d0..5cb5b44b3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json @@ -28,7 +28,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:prismarine_shard", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/natu.json b/common/src/main/resources/data/cobblemon/species/generation2/natu.json index eade019f61..c5c5cec150 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/natu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/natu.json @@ -33,7 +33,7 @@ "flying" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json index 46df1c5c0c..65b47b0eeb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json @@ -34,7 +34,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:kings_rock", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json index 0d85d73df1..f8bb43d261 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json @@ -26,7 +26,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:upgrade", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json index 6b2194b56e..4c3257767c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json @@ -81,7 +81,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:metal_coat", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json index 115f4dd948..9441e457d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json @@ -56,7 +56,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:razor_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json index 667027c0df..8e0b6f9090 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json @@ -26,7 +26,7 @@ "undiscovered" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:black_belt", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json index 94a30203f0..73c7244d7d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json @@ -73,7 +73,7 @@ "field" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json index 5fbfc83cd6..f4b8e98037 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json @@ -26,7 +26,7 @@ "field" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json index d9c707f17f..6da398862a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json @@ -34,7 +34,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json b/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json index d153c4e309..26971f33c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:deep_sea_scale", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json index 4ab22fcd82..cddd9078d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json @@ -35,7 +35,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json index da28e81991..ba0272eb2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json @@ -34,7 +34,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json index b72c01afd0..85a5cd40c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json @@ -74,7 +74,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json index 76acfd63e6..9f86a5e2aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json @@ -75,7 +75,7 @@ "water_1" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:clay_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json index 17d6178faf..a9d8a77bf1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json @@ -25,7 +25,7 @@ "field" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json index b5aad8c3e3..8d376623d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json @@ -34,7 +34,7 @@ "dragon" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json index 9e2a08fc5c..be660cc3e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json @@ -9,7 +9,7 @@ "h:limber" ], "drops": { - "amount": "5", + "amount": 5, "entries": [ { "item": "minecraft:rabbit" diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json index ec7886da9c..c2d7ef7e39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json @@ -8,7 +8,7 @@ "h:ironfist" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:charcoal_stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json index d2e694c43a..6d601c8cf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json @@ -9,7 +9,7 @@ "h:defiant" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json index 756c907459..8d1e9b6c3b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json @@ -8,7 +8,7 @@ "h:waterveil" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:cod" diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json index aedc5c22a5..ca47fc3b04 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json @@ -9,7 +9,7 @@ "h:roughskin" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:dragon_fang", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json index cce9273601..8e836a75e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json @@ -9,7 +9,7 @@ "h:roughskin" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:dragon_fang", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json index b40f962615..62b1d55e65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json @@ -9,7 +9,7 @@ "h:sandforce" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gible.json b/common/src/main/resources/data/cobblemon/species/generation4/gible.json index 306e459cd4..4f8e2d02e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gible.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gible.json @@ -9,7 +9,7 @@ "h:roughskin" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:dragon_fang", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json index df40fe3d19..ce3c9edc14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json @@ -8,7 +8,7 @@ "h:keeneye" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json index f074620d3c..e2b19280a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json @@ -8,7 +8,7 @@ "h:shellarmor" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json index 8f0a75ca9b..9e6eb15daa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json @@ -26,7 +26,7 @@ "undiscovered" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:oval_stone", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json index 34a5d19546..94a7041878 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json @@ -7,7 +7,7 @@ "h:sandforce" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:soft_sand", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json index 856830ffc5..a34afe65f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json @@ -7,7 +7,7 @@ "h:sandforce" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:soft_sand", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json index 0bf7a35381..1a8620dd6c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json @@ -38,7 +38,7 @@ "flying" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json index d328d94b47..04ff5f2074 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json @@ -9,7 +9,7 @@ "h:ironfist" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:charcoal_stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json index 0c4fa25035..6c18f53b2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json @@ -8,7 +8,7 @@ "h:runaway" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:coba_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json index 07386a9f77..a676bcbf87 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json @@ -8,7 +8,7 @@ "h:technician" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:coba_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json index a7a5257f5b..b46011ef06 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json @@ -9,7 +9,7 @@ "h:cloudnine" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:slime_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json index 1e9aa3aa71..2735c3faed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json @@ -9,7 +9,7 @@ "h:limber" ], "drops": { - "amount": "5", + "amount": 5, "entries": [ { "item": "minecraft:rabbit" diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index 2f19a0afd8..d45cd89cce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -10,7 +10,7 @@ "h:justified" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:chople_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index d093f4b253..9aa42c656d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json @@ -8,7 +8,7 @@ "h:waterveil" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "cobblemon:cod" diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json index ee81776e4e..5c5b404386 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json @@ -9,7 +9,7 @@ "h:guts" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:quick_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index 3f4a14d350..6a1c21db95 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -9,7 +9,7 @@ "h:guts" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:quick_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index dd94c81a59..69ba4ad77d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -10,7 +10,7 @@ "h:thickfat" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:porkchop", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index 9dd40540ba..bb83a5b512 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -10,7 +10,7 @@ "h:technician" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:light_clay", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index 673352eeb9..987caad7bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -7,7 +7,7 @@ "levitate" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:spell_tag", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json index 5aadb3ee89..9bbfa559a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json @@ -9,7 +9,7 @@ "h:ironfist" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:charcoal_stick", 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 a2597c7709..83f7cee208 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -8,7 +8,7 @@ "h:tintedlens" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:silver_powder", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json index 059caa5b51..571389ffa8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json @@ -8,7 +8,7 @@ "h:defiant" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json index 671962bbb6..269d847dd0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json @@ -9,7 +9,7 @@ "h:analytic" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:dubious_disc", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json index 144aac3097..025c080f5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json @@ -8,7 +8,7 @@ "h:defiant" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json index 2e69ef2bfd..ead327b923 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -8,7 +8,7 @@ "h:defiant" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json index 6fbc189a42..953deba4cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json @@ -7,7 +7,7 @@ "h:sheerforce" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:bone", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json index 3ab5cf7d43..9224bedfc3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json @@ -9,7 +9,7 @@ "h:prankster" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:chople_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json index 694c265336..9a00b95790 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json @@ -8,7 +8,7 @@ "h:sandforce" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:clay_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json index 66ad4308b0..eebc2dbebd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json @@ -8,7 +8,7 @@ "h:soundproof" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:bone", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json index cc16cbf483..caa8420170 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json @@ -9,7 +9,7 @@ "h:guts" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:quick_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json index a4ee88967e..7537dae23d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json @@ -9,7 +9,7 @@ "h:keeneye" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", 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 692ae0209a..07a45f1b3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -9,7 +9,7 @@ "h:keeneye" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:pecha_berry", 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 6672e04670..e67847e0e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/snover.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/snover.json @@ -8,7 +8,7 @@ "h:soundproof" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:snowball", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json index 94daec7f66..4498384abb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -9,7 +9,7 @@ "h:infiltrator" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:spell_tag", 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 9773346ccb..a1ee394cb6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json @@ -9,7 +9,7 @@ "h:keeneye" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:pecha_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json index 29c06340eb..fa92a1ed3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json @@ -9,7 +9,7 @@ "h:regenerator" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:vines", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json index f684d27f24..d4811a4674 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json @@ -9,7 +9,7 @@ "h:shellarmor" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json index a7892644b0..f648f068ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -9,7 +9,7 @@ "h:poisontouch" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:black_sludge", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json index 649242e241..3d290a1b17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json @@ -8,7 +8,7 @@ "h:shellarmor" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index 87f999b5e3..dfc6854ed3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -9,7 +9,7 @@ "h:pickpocket" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "cobblemon:razor_claw", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json index f174027d70..bfc8ddc0a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json @@ -7,6 +7,20 @@ "effectspore", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:red_mushroom", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 114, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/archen.json b/common/src/main/resources/data/cobblemon/species/generation5/archen.json index 18778fa527..4edfcb1bdc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/archen.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/archen.json @@ -6,6 +6,16 @@ "abilities": [ "defeatist" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 55, "attack": 112, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/archeops.json b/common/src/main/resources/data/cobblemon/species/generation5/archeops.json index 675e4fc5a4..d5907d4e62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/archeops.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/archeops.json @@ -6,6 +6,16 @@ "abilities": [ "defeatist" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-3", + "percentage": 75 + } + ] + }, "baseStats": { "hp": 75, "attack": 140, 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 58578d4333..e92715967e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -7,6 +7,15 @@ "regenerator", "h:klutz" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 103, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/axew.json b/common/src/main/resources/data/cobblemon/species/generation5/axew.json index 506d427d33..78e347e55e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/axew.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/axew.json @@ -7,6 +7,19 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json index 7bee20969d..8143112906 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json @@ -8,6 +8,18 @@ "adaptability", "h:moldbreaker" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:salmon" + }, + { + "item": "minecraft:bone_meal", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 92, @@ -38,18 +50,6 @@ } } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:salmon" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5 - } - ] - }, "moves": [ "1:tailwhip", "1:watergun", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json index ddbf2b47b7..fb161d9699 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json @@ -7,6 +7,25 @@ "slushrush", "h:swiftswim" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snowball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:cod", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 95, "attack": 130, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json index e7ba0ed5c3..7ba87499c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json @@ -8,6 +8,29 @@ "synchronize", "h:analytic" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:ender_pearl", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:chorus_fruit", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:light_clay", + "percentage": 5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 75, @@ -33,25 +56,6 @@ "eggGroups": [ "human_like" ], - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:ender_pearl", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "minecraft:chorus_fruit", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "cobblemon:light_clay", - "percentage": 5 - } - ] - }, "moves": [ "1:confusion", "1:growl", 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 16a57037ec..c47c72c410 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -8,6 +8,19 @@ "innerfocus", "h:pressure" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:iron_helmet", + "percentage": 5 + }, + { + "item": "cobblemon:chople_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json index d9efd370b2..0a9f3fdde0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json @@ -7,6 +7,19 @@ "motordrive", "h:sapsipper" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:leather", + "percentage": 50 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json index 0300a2a8d0..0ba0266443 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json @@ -13,8 +13,8 @@ "entries": [ { "item": "minecraft:raw_copper", - "percentage": 66, - "quantityRange": "1-2" + "quantityRange": "1-2", + "percentage": 66 }, { "item": "cobblemon:hard_stone", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json index 816e92a5ed..18f65c73a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json @@ -9,19 +9,26 @@ "h:soundproof" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:leather", - "quantityRange": "1-3" + "quantityRange": "1-2", + "percentage": 66 }, { "item": "minecraft:beef", - "quantityRange": "2-4" + "quantityRange": "1-3", + "percentage": 75 }, { "item": "minecraft:brown_wool", - "quantityRange": "1-2" + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json index 395fa429ac..0dae0f5f18 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json @@ -8,6 +8,27 @@ "sheerforce", "h:defiant" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 100, "attack": 123, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json b/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json index fa788a6b93..af4862e947 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json @@ -8,6 +8,16 @@ "sturdy", "h:swiftswim" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:scute", + "quantityRange": "1-3", + "percentage": 75 + } + ] + }, "baseStats": { "hp": 74, "attack": 108, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json index b72b52fd6a..b6c98f2499 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json @@ -8,6 +8,23 @@ "flamebody", "h:infiltrator" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:candle", + "quantityRange": "1-3" + }, + { + "item": "cobblemon:dusk_stone", + "percentage": 10 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 60, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json index 02247a5d7a..fc38fe05b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json @@ -7,6 +7,19 @@ "technician", "h:skilllink" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:silk_scarf", + "percentage": 5 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 95, 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 29baf34796..c45a0c18ef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json @@ -6,6 +6,14 @@ "abilities": [ "justified" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat" + } + ] + }, "baseStats": { "hp": 91, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json index ef91b07c42..b20ee44d08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json @@ -9,15 +9,18 @@ "h:ironfist" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 10 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 10 } ] }, - "baseStats": { "hp": 105, "attack": 140, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json index 72138798e8..63c3ea0a15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json @@ -10,10 +10,14 @@ "h:chlorophyll" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:white_wool" + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json index 8f01481d09..728f7d8a34 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json @@ -18,7 +18,6 @@ } ] }, - "baseStats": { "hp": 70, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json index 8fe94cefb5..77862d9eab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json @@ -6,6 +6,19 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:nevermelt_ice", + "percentage": 5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 80, "attack": 50, @@ -31,15 +44,6 @@ "eggGroups": [ "mineral" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:nevermelt_ice", - "percentage": 5 - } - ] - }, "moves": [ "1:bind", "1:iceshard", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json b/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json index 55300ed3b1..14ff78eeb8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json @@ -7,6 +7,23 @@ "slushrush", "h:rattled" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snowball", + "percentage": 50 + }, + { + "item": "minecraft:cod", + "percentage": 50 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 55, "attack": 70, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json index a4c0e9f71b..e6d99af4e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json @@ -6,6 +6,15 @@ "sheerforce", "h:zenmode" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:rawst_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 105, "attack": 140, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json index 3adbd4e379..ed3f9cf496 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json @@ -6,6 +6,15 @@ "hustle", "h:innerfocus" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 70, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json index ff11891741..795dcbb46a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json @@ -9,6 +9,19 @@ "sapsipper", "h:serenegrace" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:leather", + "percentage": 50 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 60, @@ -29,15 +42,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:leather", - "percentage": 50 - } - ] - }, "moves": [ "1:camouflage", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deino.json b/common/src/main/resources/data/cobblemon/species/generation5/deino.json index ae41f7e353..06789e0481 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deino.json @@ -6,6 +6,19 @@ "abilities": [ "hustle" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:dragon_breath", + "percentage": 50 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 52, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json index ab424f571f..5da89e2c40 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json @@ -7,6 +7,19 @@ "torrent", "h:shellarmor" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 10 + }, + { + "item": "minecraft:nautilus_shell", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 75, "attack": 75, @@ -24,20 +37,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:nautilus_shell", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "cobblemon:mystic_water", - "percentage": 10 - } - ] - }, "moves": [ "1:soak", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json index eacc79b845..bb2957c615 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json @@ -7,6 +7,19 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json index 9868254369..8ba3802457 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json @@ -7,6 +7,19 @@ "sheerforce", "h:moldbreaker" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:dragon_fang", + "percentage": 5 + }, + { + "item": "minecraft:haban_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 77, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json index e46b04aa76..bdcb9121e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json @@ -8,6 +8,22 @@ "bigpecks", "h:hydration" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 62, "attack": 44, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json index de1f8e655c..5f9f83462d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json @@ -7,6 +7,20 @@ "magicguard", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:slime_ball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/durant.json b/common/src/main/resources/data/cobblemon/species/generation5/durant.json index f4e4ca0515..b87404064a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/durant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/durant.json @@ -9,6 +9,19 @@ "hustle", "h:truant" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 50 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 58, "attack": 109, @@ -26,15 +39,6 @@ "eggGroups": [ "bug" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:raw_iron", - "percentage": 50 - } - ] - }, "moves": [ "1:furycutter", "1:sandattack", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json index 0675f48c72..3fc2e0c206 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json @@ -10,14 +10,10 @@ "h:weakarmor" ], "drops": { - "amount": 2, + "amount": 1, "entries": [ { - "item": "minecraft:raw_iron", - "percentage": 50 - }, - { - "item": "cobblemon:occa_berry", + "item": "cobblemon:hard_stone", "percentage": 2.5 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json index 647b21859c..f90d44a113 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json @@ -5,6 +5,16 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:slime_ball", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 65, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json index d1a3104947..1ed76bda2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json @@ -5,6 +5,16 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:slime_ball", + "quantityRange": "1-3", + "percentage": 75 + } + ] + }, "baseStats": { "hp": 85, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json index e258b006ae..c669167bf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json @@ -8,6 +8,27 @@ "synchronize", "h:analytic" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:ender_pearl", + "percentage": 50 + }, + { + "item": "minecraft:chorus_fruit", + "percentage": 50 + }, + { + "item": "cobblemon:light_clay", + "percentage": 2.5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 55, "attack": 55, @@ -33,23 +54,6 @@ "eggGroups": [ "human_like" ], - "drops": { - "amount": "3", - "entries": [ - { - "item": "minecraft:ender_pearl", - "percentage": 50 - }, - { - "item": "minecraft:chorus_fruit", - "percentage": 50 - }, - { - "item": "cobblemon:light_clay", - "percentage": 2.5 - } - ] - }, "moves": [ "1:confusion", "1:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json index 0d549b8f19..67ce0a5eae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json @@ -8,6 +8,19 @@ "blaze", "h:reckless" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:porkchop", + "quantityRange": "2-4" + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 110, "attack": 123, @@ -33,19 +46,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "2-4" - }, - { - "item": "cobblemon:charcoal_stick", - "percentage": 20 - } - ] - }, "moves": [ "1:armthrust", "1:ember", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json index 4f60143d8f..bf42e16211 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json @@ -12,12 +12,11 @@ "amount": 1, "entries": [ { - "item": "cobblemon:cheri_berry", - "percentage": 10 + "item": "cobblemon:yache_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 55, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json index f8f5ab2bb4..82b5a10272 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json @@ -8,6 +8,19 @@ "shellarmor", "h:overcoat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:iron_helmet", + "percentage": 5 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 135, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json index 85676958d9..faddb8337e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json @@ -8,6 +8,19 @@ "sandforce", "h:moldbreaker" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:soft_sand", + "percentage": 5 + }, + { + "item": "cobblemon:pinap_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 110, "attack": 135, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json b/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json index 1fdede7da1..6f37816fe6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json @@ -6,6 +6,19 @@ "abilities": [ "ironbarbs" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 50 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 44, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json index cba91d0630..40af2add17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json @@ -7,6 +7,20 @@ "ironbarbs", "h:anticipation" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 74, "attack": 94, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json index d4e82e1293..7fe556f39c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json @@ -7,6 +7,19 @@ "effectspore", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:red_mushroom", + "percentage": 50 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 69, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json index fcb5cad271..02fecdeb0c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json @@ -7,6 +7,19 @@ "moldbreaker", "h:unnerve" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:dragon_fang", + "percentage": 5 + }, + { + "item": "cobblemon:haban_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 66, "attack": 117, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json index 7e44c2e53d..92cc52bd44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json @@ -8,6 +8,19 @@ "cursedbody", "h:damp" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:glow_inc_sac", + "percentage": 50 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 55, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json index 50fcd3c584..db5a5fdb3e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json @@ -9,6 +9,30 @@ "unnerve", "h:swarm" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:spider_eye", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 77, @@ -33,21 +57,6 @@ } } }, - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "minecraft:spider_eye", - "quantityRange": "1-2", - "percentage": 66 - } - ] - }, "moves": [ "1:absorb", "1:bugbite", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json index 32416b54e7..9a7268ba4b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json @@ -7,6 +7,27 @@ "weakarmor", "h:aftermath" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "cobblemon:black_sludge", + "percentage": 5 + }, + { + "item": "cobblemon:leftovers", + "percentage": 5 + }, + { + "item": "minecraft:silk_scarf", + "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 80, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golett.json b/common/src/main/resources/data/cobblemon/species/generation5/golett.json index b655272fc2..0f31de5328 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golett.json @@ -10,7 +10,7 @@ "h:noguard" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:clay_ball", @@ -19,10 +19,13 @@ { "item": "cobblemon:light_clay", "percentage": 2.5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 59, "attack": 74, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json index ef220311d0..7c2036cd7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json @@ -10,20 +10,23 @@ "h:noguard" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:clay_ball", - "percentage": 66, - "quantityRange": "1-2" + "quantityRange": "1-2", + "percentage": 66 }, { "item": "cobblemon:light_clay", "percentage": 5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 89, "attack": 124, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json index 9a0a973a14..1786aa317e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json @@ -8,15 +8,18 @@ "h:shadowtag" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:twisted_spoon", "percentage": 2.5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 45, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json index 91a02101e6..2ed236c9d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json @@ -8,15 +8,18 @@ "h:shadowtag" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:twisted_spoon", "percentage": 10 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 10 } ] }, - "baseStats": { "hp": 70, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json index 830b382eb3..7691fdd37d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json @@ -8,15 +8,18 @@ "h:shadowtag" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:twisted_spoon", "percentage": 5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 60, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json index 09385ef71b..edfd19c546 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json @@ -9,15 +9,18 @@ "h:ironfist" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 85, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json index 77cd589cc0..64db4f73a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json @@ -7,6 +7,19 @@ "moldbreaker", "h:unnerve" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:dragon_fang", + "percentage": 10 + }, + { + "item": "cobblemon:haban_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 76, "attack": 147, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json index 8558c54ec3..2a06713935 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json @@ -8,6 +8,19 @@ "flashfire", "h:whitesmoke" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:blaze_powder", + "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 85, "attack": 97, @@ -33,15 +46,6 @@ "light": "0-4" } }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:blaze_powder", - "percentage": 5 - } - ] - }, "moves": [ "1:lick", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json index c9a66bb9bb..5a5c7395ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json @@ -9,20 +9,23 @@ "h:scrappy" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:bone", - "percentage": 66, - "quantityRange": "1-2" + "quantityRange": "1-2", + "percentage": 66 }, { "item": "minecraft:blue_wool", "quantityRange": "1-2" + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 65, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json index 931c015e6d..9a492ad54d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json @@ -6,6 +6,20 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:dragon_breath", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 92, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json index ec453f6f0f..84fb952af5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json @@ -8,6 +8,20 @@ "cursedbody", "h:damp" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:glow_ink_sac", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 100, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json index 171d0321c0..b86faccf65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json @@ -9,6 +9,27 @@ "unnerve", "h:swarm" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + }, + { + "item": "minecraft:spider_eye", + "percentage": 50 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 47, @@ -26,19 +47,6 @@ "eggGroups": [ "bug" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:string", - "percentage": 50 - }, - { - "item": "minecraft:spider_eye", - "percentage": 50 - } - ] - }, "moves": [ "1:absorb", "1:furycutter", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json index 202010e7e9..fea4b0d07e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json @@ -7,6 +7,15 @@ "shedskin", "h:noguard" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:occa_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klang.json b/common/src/main/resources/data/cobblemon/species/generation5/klang.json index 7b78c520cf..c2da6089c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klang.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klang.json @@ -8,6 +8,16 @@ "minus", "h:clearbody" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:raw_iron", + "quantityRange": "1-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 60, "attack": 80, @@ -33,16 +43,6 @@ "eggGroups": [ "mineral" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:raw_iron", - "quantityRange": "1-2", - "percentage": 66 - } - ] - }, "moves": [ "1:bind", "1:charge", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klink.json b/common/src/main/resources/data/cobblemon/species/generation5/klink.json index 852dca64a9..b0fc76c470 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klink.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klink.json @@ -8,6 +8,15 @@ "minus", "h:clearbody" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 40, "attack": 55, @@ -33,15 +42,6 @@ "eggGroups": [ "mineral" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:raw_iron", - "percentage": 50 - } - ] - }, "moves": [ "1:thundershock", "1:visegrip", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json b/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json index 8b0d780f23..6e7d8656f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json @@ -8,6 +8,16 @@ "minus", "h:clearbody" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:raw_iron", + "quantityRange": "1-3", + "percentage": 75 + } + ] + }, "baseStats": { "hp": 60, "attack": 100, @@ -33,16 +43,6 @@ "eggGroups": [ "mineral" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:raw_iron", - "quantityRange": "1-3", - "percentage": 75 - } - ] - }, "moves": [ "1:bind", "1:charge", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json index 1d4f43d86b..336a5b44c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json @@ -8,6 +8,19 @@ "moxie", "h:angerpoint" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_glasses", + "percentage": 5 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 82, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json index c8eff26da1..b504d373cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json @@ -8,6 +8,19 @@ "moxie", "h:angerpoint" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_glasses", + "percentage": 10 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 95, "attack": 117, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json index fa4541f762..87954b23a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json @@ -8,6 +8,22 @@ "flamebody", "h:infiltrator" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:candle" + }, + { + "item": "cobblemon:dusk_stone", + "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json index f4fd64ab0a..4bbaf3c7d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json @@ -7,6 +7,27 @@ "flamebody", "h:swarm" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + }, + { + "item": "minecraft:blaze_powder", + "percentage": 2.5 + }, + { + "item": "cobblemon:silver_powder", + "percentage": 2.5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 55, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json index dcfd3cc95e..67084aa9f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json @@ -8,6 +8,28 @@ "chlorophyll", "h:overcoat" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:mental_herb", + "percentage": 10 + }, + { + "item": "cobblemon:revival_herb", + "percentage": 10 + }, + { + "item": "cobblemon:coba_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 75, "attack": 103, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json index 2f7c9bcd02..70d13b4664 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json @@ -7,6 +7,20 @@ "unburden", "h:prankster" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:rotten_flesh", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 64, "attack": 88, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json index bfe146d367..57e9d9d814 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -7,6 +7,23 @@ "owntempo", "h:leafguard" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:big_root", + "percentage": 5 + }, + { + "item": "cobblemon:revival_herb", + "percentage": 5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 70, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json index dfc46c8e6c..839cc6403f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json @@ -9,7 +9,7 @@ "h:runaway" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:bone", @@ -17,10 +17,13 @@ }, { "item": "minecraft:blue_wool" + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 45, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/litwick.json b/common/src/main/resources/data/cobblemon/species/generation5/litwick.json index 152da0887e..3a329c7d19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/litwick.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/litwick.json @@ -8,6 +8,22 @@ "flamebody", "h:infiltrator" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:candle" + }, + { + "item": "cobblemon:dusk_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 30, 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 82cbfc4162..9cfa092677 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -8,6 +8,32 @@ "overcoat", "h:weakarmor" ], + "drops": { + "amount": 5, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:rotten_flesh", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 110, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json index 7a57ac8e90..c056fce88a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json @@ -13,16 +13,15 @@ "entries": [ { "item": "minecraft:cactus", - "percentage": 75, - "quantityRange": "1-3" + "quantityRange": "1-2", + "percentage": 66 }, { - "item": "cobblemon:occa_berry", - "percentage": 2.5 + "item": "cobblemon:miracle_seed", + "percentage": 5 } ] }, - "baseStats": { "hp": 75, "attack": 86, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json index 6241fb5141..083780e10d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json @@ -7,6 +7,15 @@ "regenerator", "h:reckless" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:payapa_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json index b9c00523c7..2db457ba07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json @@ -7,6 +7,15 @@ "regenerator", "h:reckless" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:payapa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json index d7087e6ca9..0a042217a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json @@ -7,6 +7,19 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/munna.json b/common/src/main/resources/data/cobblemon/species/generation5/munna.json index b37fea1c91..6fd0573289 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/munna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/munna.json @@ -7,6 +7,15 @@ "synchronize", "h:telepathy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 76, "attack": 25, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json index 9bd8da62d3..4f3da0d9cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json @@ -7,6 +7,15 @@ "synchronize", "h:telepathy" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:chesto_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 116, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json index 35ebecf0ca..256e56dc72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json @@ -7,6 +7,19 @@ "torrent", "h:shellarmor" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 5 + }, + { + "item": "minecraft:nautilus_shell", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 55, "attack": 55, @@ -24,19 +37,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:nautilus_shell", - "percentage": 50 - }, - { - "item": "cobblemon:mystic_water", - "percentage": 5 - } - ] - }, "moves": [ "1:tackle", "5:tailwhip", 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 5d473d0bee..60660e8892 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json @@ -8,6 +8,20 @@ "hydration", "h:waterabsorb" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:clay_ball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json index fb511885d0..a7bdd67ad5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json @@ -6,6 +6,23 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json index 8af47636b3..f01e935407 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json @@ -6,6 +6,23 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json index 5be5768769..436d350510 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json @@ -6,6 +6,23 @@ "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json index 90254ad93c..1fc215bb1f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json @@ -12,12 +12,11 @@ "amount": 1, "entries": [ { - "item": "cobblemon:pinap_berry", + "item": "cobblemon:babiri_berry", "percentage": 2.5 } ] }, - "baseStats": { "hp": 45, "attack": 55, 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 bfb3cdd24f..e8b9f1ad9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json @@ -8,6 +8,19 @@ "innerfocus", "h:pressure" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:iron_helmet", + "percentage": 2.5 + }, + { + "item": "cobblemon:chople_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json index 7ce054e5d7..dee618d44b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json @@ -7,6 +7,23 @@ "owntempo", "h:leafguard" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:big_root", + "percentage": 2.5 + }, + { + "item": "cobblemon:revival_herb", + "percentage": 2.5 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json index a54a431413..c389abf56d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json @@ -10,7 +10,7 @@ "h:rivalry" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:feather", @@ -18,10 +18,13 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:razz_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 50, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json index e75be4b494..c3cc187f17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json @@ -8,6 +8,20 @@ "blaze", "h:thickfat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:porkchop", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 90, "attack": 93, @@ -33,20 +47,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "1-3", - "percentage": 75 - }, - { - "item": "cobblemon:charcoal_stick", - "percentage": 10 - } - ] - }, "moves": [ "1:armthrust", "1:ember", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json index 1d54403efa..365e305c53 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json @@ -7,6 +7,19 @@ "unburden", "h:prankster" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 41, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json index c66cf24f5b..0029fa8085 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json @@ -7,6 +7,20 @@ "magicguard", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:slime_ball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 110, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json index df480613eb..93ad172b35 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json @@ -25,7 +25,6 @@ } ] }, - "baseStats": { "hp": 55, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json index e97e333163..3ea3c77ba2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json @@ -8,6 +8,22 @@ "sheerforce", "h:hustle" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:razz_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 70, "attack": 83, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index 7c65f1cd97..3f4f052a85 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -11,17 +11,16 @@ "amount": 2, "entries": [ { - "item": "minecraft:nautilus_shell", - "percentage": 75, - "quantityRange": "1-3" + "item": "cobblemon:mystic_water", + "percentage": 25 }, { - "item": "cobblemon:mystic_water", - "percentage": 20 + "item": "minecraft:nautilus_shell", + "percentage": 25 } + ] }, - "baseStats": { "hp": 95, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json index 4e1b5e01f1..1e558cd34b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json @@ -8,6 +8,20 @@ "moxie", "h:angerpoint" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_glasses", + "percentage": 2.5 + }, + { + "item": "minecraft:tanga_berry", + "percentage": 2.5 + } + + ] + }, "baseStats": { "hp": 50, "attack": 72, 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 a87732b24e..b35dc5e1d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -7,6 +7,20 @@ "innerfocus", "h:moldbreaker" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_belt", + "percentage": 5 + }, + { + "item": "minecraft:bluk_berry", + "percentage": 5 + } + + ] + }, "baseStats": { "hp": 75, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json index c924f43065..1a4dc66732 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json @@ -9,6 +9,20 @@ "sapsipper", "h:serenegrace" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:leather", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 80, "attack": 100, @@ -29,16 +43,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:leather", - "quantityRange": "1-2", - "percentage": 66 - } - ] - }, "moves": [ "1:camouflage", "1:growl", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json index 73207d1516..7fbedf75b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json @@ -10,15 +10,18 @@ "h:speedboost" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 10 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 10 } ] }, - "baseStats": { "hp": 60, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json index a62656523a..db0e33763b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json @@ -8,6 +8,19 @@ "moxie", "h:intimidate" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_belt", + "percentage": 5 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json index b7010f56d0..8abdb14db0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json @@ -8,6 +8,19 @@ "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, 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 3fd36b03b7..0dec8ac525 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json @@ -8,6 +8,20 @@ "poisontouch", "h:waterabsorb" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:clay_ball", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 105, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json index f116493595..f1d080c68e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json @@ -26,7 +26,7 @@ "grass" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/servine.json b/common/src/main/resources/data/cobblemon/species/generation5/servine.json index bd766bf3df..682f1676e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/servine.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/servine.json @@ -7,6 +7,15 @@ "overgrow", "h:contrary" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 60, "attack": 60, @@ -25,15 +34,6 @@ "field", "grass" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:miracle_seed", - "percentage": 10 - } - ] - }, "moves": [ "1:leer", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json index 3c76f13d02..242a728587 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json @@ -8,6 +8,27 @@ "chlorophyll", "h:overcoat" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "percentage": 50 + }, + { + "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, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json index c92fc3000e..859b30fde6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json @@ -7,6 +7,15 @@ "shellarmor", "h:overcoat" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:iron_helmet", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 40, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json index 72b3c1f4b6..a6bea96044 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json @@ -9,6 +9,19 @@ "magicguard", "h:tintedlens" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:light_clay", + "percentage": 5 + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 72, "attack": 58, @@ -39,15 +52,6 @@ "eggGroups": [ "flying" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:light_clay", - "percentage": 5 - } - ] - }, "moves": [ "1:confusion", "1:gust", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json index d7bebc18b7..e06a575497 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json @@ -6,6 +6,23 @@ "gluttony", "h:torrent" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:water_stone", + "percentage": 5 + }, + { + "item": "cobblemon:mystic_water", + "percentage": 5 + }, + { + "item": "cobblemon:rindo_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 98, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json index b578084ad2..46dbcc86ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json @@ -6,6 +6,23 @@ "gluttony", "h:overgrow" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:leaf_stone", + "percentage": 5 + }, + { + "item": "cobblemon:miracle_seed", + "percentage": 5 + }, + { + "item": "cobblemon:occa_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 98, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json index a8c2e7f7e8..21dfeeabe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json @@ -6,6 +6,23 @@ "gluttony", "h:blaze" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:fire_stone", + "percentage": 5 + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 98, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json index d9bee5ae49..d933651380 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json @@ -7,6 +7,15 @@ "overgrow", "h:contrary" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 45, "attack": 45, @@ -25,15 +34,6 @@ "field", "grass" ], - "drops": { - "amount": "1", - "entries": [ - { - "item": "cobblemon:miracle_seed", - "percentage": 5 - } - ] - }, "moves": [ "1:tackle", "4:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json index af8468232b..b811a91f85 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json @@ -7,6 +7,19 @@ "magicguard", "h:regenerator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:slime_ball", + "percentage": 50 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json index 152b1ab0a6..74f11ca76a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json @@ -9,20 +9,23 @@ "h:scrappy" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:bone", - "percentage": 75, - "quantityRange": "1-3" + "quantityRange": "1-3", + "percentage": 75 }, { "item": "minecraft:blue_wool", "quantityRange": "2-3" + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 10 } ] }, - "baseStats": { "hp": 85, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json index ec978e128e..2052a9e773 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json @@ -8,6 +8,20 @@ "limber", "h:sandveil" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:mud", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 109, "attack": 66, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json index a4ecc7e197..94781e87bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json @@ -8,6 +8,28 @@ "chlorophyll", "h:overcoat" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-2", + "percentage": 66 + }, + { + "item": "cobblemon:mental_herb", + "percentage": 5 + }, + { + "item": "cobblemon:revival_herb", + "percentage": 5 + }, + { + "item": "cobblemon:coba_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 55, "attack": 63, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json index f34be8367d..22a84afc0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json @@ -8,6 +8,27 @@ "bigpecks", "h:hydration" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-2", + "percentage": 66 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:sharp_beak", + "percentage": 2.5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 87, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json index f7e4224da4..60bf624781 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json @@ -8,6 +8,19 @@ "klutz", "h:simple" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:light_blue_wool", + "quantityRange": "1-2" + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 67, "attack": 57, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json index 8e88f68736..f0a8efff05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json @@ -7,6 +7,19 @@ "blaze", "h:thickfat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:porkchop", + "quantityRange": "1-2" + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 63, @@ -32,20 +45,6 @@ "eggGroups": [ "field" ], - "drops": { - "amount": "2", - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "1-2", - "percentage": 66 - }, - { - "item": "cobblemon:charcoal_stick", - "percentage": 5 - } - ] - }, "moves": [ "1:tackle", "3:tailwhip", 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 de9655273a..2e2294bb2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json @@ -6,6 +6,14 @@ "abilities": [ "justified" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:hard_stone" + } + ] + }, "baseStats": { "hp": 91, "attack": 129, 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 5d3e7380c3..f3d9ea3339 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -7,6 +7,19 @@ "innerfocus", "h:moldbreaker" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_belt", + "percentage": 5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 120, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json index 951b2860b6..9837668c71 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json @@ -9,15 +9,18 @@ "h:ironfist" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", "percentage": 2.5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 75, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json b/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json index 3cbdc40ab8..1eed511c06 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json @@ -8,6 +8,16 @@ "sturdy", "h:swiftswim" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:scute", + "quantityRange": "0-2", + "percentage": 66 + } + ] + }, "baseStats": { "hp": 54, "attack": 78, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json index acf014a246..9967e0054c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json @@ -10,12 +10,12 @@ "h:rivalry" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", - "percentage": 66, - "quantityRange": "1-2" + "quantityRange": "1-2", + "percentage": 66 }, { "item": "minecraft:chicken" @@ -23,10 +23,13 @@ { "item": "cobblemon:sharp_beak", "percentage": 2.5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 62, "attack": 77, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json index 3c3ecbd6eb..efe87f27b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json @@ -7,6 +7,27 @@ "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": 5 + } + ] + }, "baseStats": { "hp": 50, "attack": 50, 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 658e60cb91..a590e98bfe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tympole.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tympole.json @@ -7,6 +7,19 @@ "hydration", "h:waterabsorb" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 50 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json index 72b20c562f..a6b67ef91f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json @@ -5,6 +5,15 @@ "abilities": [ "levitate" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:slime_ball", + "percentage": 50 + } + ] + }, "baseStats": { "hp": 35, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json index e15a783bb8..c198f1f90b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json @@ -10,7 +10,7 @@ "h:rivalry" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -23,10 +23,13 @@ { "item": "cobblemon:sharp_beak", "percentage": 5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 10 } ] }, - "baseStats": { "hp": 80, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json index 8579dc14ca..30bc21a995 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json @@ -7,6 +7,24 @@ "snowcloak", "h:weakarmor" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snow_ball", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 51, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json index fcdb4fe445..45f1595b0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json @@ -7,6 +7,23 @@ "snowcloak", "h:weakarmor" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snow_ball", + "percentage": 50 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 2.5 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 36, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json index bac1881999..07ed24fd18 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json @@ -7,6 +7,24 @@ "snowwarning", "h:weakarmor" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snow_ball", + "quantityRange": "1-3", + "percentage": 75 + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 10 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 71, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json index e18c3e0f11..b379834e24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json @@ -9,16 +9,19 @@ "swarm", "h:speedboost" ], - "drops": { - "amount": 1, + "drops": { + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 } ] }, - "baseStats": { "hp": 30, "attack": 45, 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 a72c1dc71f..0e7111166e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json @@ -6,6 +6,14 @@ "abilities": [ "justified" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed" + } + ] + }, "baseStats": { "hp": 91, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json index e2170e19a6..19398868ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json @@ -7,6 +7,23 @@ "flamebody", "h:swarm" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:blaze_powder", + "percentage": 5 + }, + { + "item": "cobblemon:silver_powder", + "percentage": 5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 85, "attack": 60, 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 e2db786460..45965f5f44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json @@ -8,6 +8,26 @@ "overcoat", "h:weakarmor" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 70, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json index 0bed3a53f5..63e0db0100 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json @@ -12,13 +12,11 @@ "amount": 1, "entries": [ { - "item": "cobblemon:pinap_berry", - "percentage": 5, - "quantityRange": "1-2" + "item": "cobblemon:babiri_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 60, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json index a528feca47..4087d4291f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json @@ -10,15 +10,18 @@ "h:chlorophyll" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:white_wool", "quantityRange": "1-2" + }, + { + "item": "cobblemon:kebia_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 60, "attack": 67, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json index 4a39fbf2e7..ed83696ac7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json @@ -10,15 +10,18 @@ "h:speedboost" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:poison_barb", "percentage": 5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, - "baseStats": { "hp": 40, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/woobat.json b/common/src/main/resources/data/cobblemon/species/generation5/woobat.json index c218a09686..8e192317ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/woobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/woobat.json @@ -8,6 +8,18 @@ "klutz", "h:simple" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:light_blue_wool" + }, + { + "item": "cobblemon:colbur_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 65, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json index 00affedad2..ebc8d8661a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json @@ -15,7 +15,6 @@ } ] }, - "baseStats": { "hp": 38, "attack": 30, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json index 52c6ea980f..ed9baf26d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json @@ -7,6 +7,20 @@ "motordrive", "h:sapsipper" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:leather", + "quantityRange": "0-2", + "percentage": 66 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json index 6200bb2efc..597ca27f97 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json @@ -5,6 +5,19 @@ "abilities": [ "illusion" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "2-4" + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 60, "attack": 105, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json index b1ad60ffae..3320d3a98e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json @@ -5,6 +5,19 @@ "abilities": [ "illusion" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "1-3" + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json index a82808d242..65523293fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json @@ -6,6 +6,20 @@ "abilities": [ "hustle" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:dragon_breath", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 72, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json index 2d8ce3cb13..6018e6e686 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json @@ -34,7 +34,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:iron_sword", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json index 206561d815..5df2d80fd0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json @@ -32,7 +32,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:stick" diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json index 079f293dd4..11445e7754 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json @@ -34,7 +34,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json index 14b56f0316..68c729d492 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json @@ -33,7 +33,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json index e89c15d5da..328604c0c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json @@ -33,7 +33,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:stick" diff --git a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json index c6513db66f..ad959bea09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json @@ -25,7 +25,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:iron_sword", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json index 3b4adc69b7..60345e7980 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json @@ -32,7 +32,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:stick" diff --git a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json index cbbe06756a..c1e2b00d96 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json @@ -39,7 +39,7 @@ "water_1" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:pearlescent_froglight", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json index 7d4597dcda..7eb34303b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json @@ -39,7 +39,7 @@ "water_1" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:pearlescent_froglight", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json index 52cfeb410a..6551e85e66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json @@ -189,7 +189,7 @@ "amorphous" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:pumpkin_seeds", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json index 699af1cfda..6d9ce836d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json @@ -25,7 +25,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:iron_sword", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json index 877b30ef70..a9bb927257 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json @@ -302,7 +302,7 @@ "amorphous" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:pumpkin_seeds", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json index e68b112e4e..fbcd76e95d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json @@ -33,7 +33,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json index d5e37f0803..a655513a66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json @@ -33,7 +33,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json index e6a9a5c445..7f420912a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json @@ -140,7 +140,7 @@ "flying" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json index f6f57c83fd..f7b23dd826 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json @@ -44,7 +44,7 @@ "mineral" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:kelp", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json index 4af94f4cf7..42a3efa314 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json @@ -26,7 +26,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:charcoal_stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/litten.json b/common/src/main/resources/data/cobblemon/species/generation7/litten.json index e305c8e9da..4cdb1c8975 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/litten.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/litten.json @@ -25,7 +25,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:charcoal_stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json index 4f0faebf15..e1603963df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json index e9e1598cd8..b780b5b2eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json @@ -44,7 +44,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json b/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json index 7250daba16..5ebd831160 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json @@ -25,7 +25,7 @@ "water_1" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:slime_ball", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json index c016b99720..b4a400d511 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json @@ -33,7 +33,7 @@ } }, "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json index 179a2842ca..2b0ed69c67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json @@ -25,7 +25,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:charcoal_stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json index 59e7c3f5df..1d6bea636c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json @@ -82,7 +82,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:sugar", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json index d2742dbb79..e9f85110a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json @@ -84,7 +84,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:blaze_powder", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json index 799d474521..6f0ca834b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json @@ -74,7 +74,7 @@ "human_like" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:rabbit_hide", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json index bed75a6ac9..1e334df727 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json @@ -26,7 +26,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json index 29c4b1e1e8..fae9f488aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json @@ -37,7 +37,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:mutton", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index db45c5e138..12f09f00c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -34,7 +34,7 @@ "field" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:feather", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json index 7cce8365a6..17a4e953af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json @@ -26,7 +26,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:stick" diff --git a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json index 3d55f2d727..0d643962ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json @@ -74,7 +74,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json b/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json index bfb35cc277..dc4108e6c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json @@ -27,7 +27,7 @@ "bug" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:stone_axe", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json index 02f9d2d54d..a1eda12e01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json @@ -26,7 +26,7 @@ "amorphous" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:sugar", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json index 12a1d9468d..511a3685f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json @@ -26,7 +26,7 @@ "human_like" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:rabbit_hide", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json index a78af5dca4..dfe2cf6aa0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json @@ -74,7 +74,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json index 45d48845be..c13ef8f3ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json @@ -26,7 +26,7 @@ "human_like" ], "drops": { - "amount": "3", + "amount": 3, "entries": [ { "item": "minecraft:rabbit_hide", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json index 4d9d78f6c4..61a3c22230 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json @@ -35,7 +35,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:blaze_powder", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json index 309003b870..1821e3392b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json @@ -26,7 +26,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json index da6175f543..2a96d01c83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json @@ -26,7 +26,7 @@ "grass" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:stick", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json index 6914714c86..859e799f9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json @@ -29,7 +29,7 @@ "field" ], "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:mutton", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json b/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json index 737eb89081..41e3c9f56c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json @@ -44,7 +44,7 @@ "field" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:leather", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json index 9fe27ecc34..92e258db1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json @@ -41,7 +41,7 @@ } }, "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:flint", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json index e66b2dd5c4..6f81ae8aa6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json @@ -47,7 +47,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:flint", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json index 09f1596f2c..ea89539352 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json @@ -47,7 +47,7 @@ "mineral" ], "drops": { - "amount": "1", + "amount": 1, "entries": [ { "item": "minecraft:flint", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index 50a82ba6eb..c023d9deb6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": "2", + "amount": 2, "entries": [ { "item": "minecraft:salmon" diff --git a/forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt b/forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt index 94a6aca40c..c26697378a 100644 --- a/forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt +++ b/forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt @@ -241,7 +241,6 @@ class CobblemonForge : CobblemonImplementation { .displayName(holder.displayName) .icon(holder.displayIconProvider) .entries(holder.entryCollector) - .withTabsBefore(*ItemGroups.getGroups().mapNotNull { Registries.ITEM_GROUP.getId(it) }.toTypedArray()) .build() helper.register(holder.key, itemGroup) itemGroup From e9edd7a1e9b6bd015e04d755baf78a0bed230f04 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 13:52:18 +0000 Subject: [PATCH 28/40] gen 8 drops --- .../species/generation8/alcremie.json | 6 ++-- .../species/generation8/boltund.json | 5 ++-- .../species/generation8/centiskorch.json | 6 +++- .../species/generation8/cinderace.json | 9 ++++-- .../species/generation8/corviknight.json | 8 +++-- .../species/generation8/corvisquire.json | 10 +++++-- .../species/generation8/dubwool.json | 6 ++-- .../cobblemon/species/generation8/eiscue.json | 29 ++++++++++++++++++- .../species/generation8/falinks.json | 6 +++- .../species/generation8/grookey.json | 3 +- .../species/generation8/inteleon.json | 2 +- .../species/generation8/kleavor.json | 4 +++ .../species/generation8/milcery.json | 3 +- .../cobblemon/species/generation8/nickit.json | 10 +++++-- .../species/generation8/obstagoon.json | 3 +- .../species/generation8/perrserker.json | 8 +++-- .../cobblemon/species/generation8/raboot.json | 5 +++- .../species/generation8/rillaboom.json | 4 +-- .../species/generation8/rookidee.json | 6 +++- .../species/generation8/scorbunny.json | 5 +++- .../species/generation8/sirfetchd.json | 18 +++++++++--- .../species/generation8/sizzlipede.json | 6 +++- .../species/generation8/thievul.json | 8 +++-- .../species/generation8/thwackey.json | 3 +- .../species/generation8/ursaluna.json | 21 ++++++++++++++ .../cobblemon/species/generation8/wooloo.json | 3 +- .../species/generation8/wyrdeer.json | 4 +++ .../cobblemon/species/generation8/yamper.json | 2 +- 28 files changed, 155 insertions(+), 48 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json index 1d6bea636c..9af67d572c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json @@ -86,12 +86,12 @@ "entries": [ { "item": "minecraft:sugar", - "quantityRange": "1-3", - "percentage": 75 + "quantityRange": "1-2", + "percentage": 66 }, { "item": "minecraft:cake", - "percentage": 10 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json index cd4806ca82..8b942c83ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json @@ -16,9 +16,8 @@ "quantityRange": "1-2" }, { - "item": "cobblemon:shuca_berry", - "percentage": 66, - "quantityRange": "1-2" + "item": "cobblemon:wepear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json index e9f85110a1..cafe5f52a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json @@ -84,11 +84,15 @@ } }, "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:blaze_powder", "percentage": 5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json index 6f0ca834b0..d28edd2fc9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json @@ -74,7 +74,7 @@ "human_like" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:rabbit_hide", @@ -83,11 +83,14 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 20 + "percentage": 25 }, { "item": "cobblemon:charcoal_stick", - "percentage": 20 + "percentage": 25 + }, + { + "item": "minecraft:rabbit" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json index cf4243b6d3..e165beeed9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json @@ -10,7 +10,7 @@ "h:mirrorarmor" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -22,7 +22,11 @@ }, { "item": "cobblemon:metal_coat", - "percentage": 5 + "percentage": 10 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json index 56eddfcd48..ebe10701c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json @@ -9,7 +9,7 @@ "h:bigpecks" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -20,8 +20,12 @@ "item": "minecraft:chicken" }, { - "item": "cobblemon:sharp_beak", - "percentage": 2.5 + "item": "cobblemon:metal_coat", + "percentage": 5 + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json index fae9f488aa..f6fafee65e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json @@ -41,13 +41,11 @@ "entries": [ { "item": "minecraft:mutton", - "quantityRange": "1-3", - "percentage": 75 + "quantityRange": "1-3" }, { "item": "minecraft:white_wool", - "quantityRange": "1-2", - "percentage": 66 + "quantityRange": "1-2" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index 12f09f00c2..f099d45390 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -34,7 +34,7 @@ "field" ], "drops": { - "amount": 3, + "amount": 5, "entries": [ { "item": "minecraft:feather", @@ -46,6 +46,13 @@ { "item": "minecraft:cod", "percentage": 50 + }, + { + "item": "minecraft:blue_ice" + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 } ] }, @@ -126,6 +133,26 @@ "abilities": [ "iceface" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 50 + }, + { + "item": "minecraft:chicken" + }, + { + "item": "minecraft:cod", + "percentage": 50 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index 7829e3b2c2..521b52bcd5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json @@ -8,11 +8,15 @@ "h:defiant" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:golden_helmet", "percentage": 5 + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json index 17a4e953af..17cf1a5c15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json @@ -29,7 +29,8 @@ "amount": 2, "entries": [ { - "item": "minecraft:stick" + "item": "minecraft:stick", + "percentage": 50 }, { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json index 0d643962ee..3acbc93622 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json @@ -78,7 +78,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json b/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json index dc4108e6c5..44d3a206a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json @@ -33,6 +33,10 @@ "item": "minecraft:stone_axe", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json index a1eda12e01..aa4eb38125 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json @@ -30,8 +30,7 @@ "entries": [ { "item": "minecraft:sugar", - "quantityRange": "1-2", - "percentage": 66 + "percentage": 50 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json index b22ba41724..3e408c9c8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json @@ -9,15 +9,19 @@ "h:stakeout" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:sweet_berries", - "quantityRange": "2-3" + "quantityRange": "1-3" }, { "item": "minecraft:emerald", - "percentage": 5 + "percentage": 2.5 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json index 627415965d..20c7baf6aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json @@ -14,8 +14,7 @@ "entries": [ { "item": "cobblemon:chople_berry", - "percentage": 10, - "quantityRange": "1-3" + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json index ea901705aa..bcbe0d8cef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -9,11 +9,15 @@ "h:steelyspirit" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 4 + "percentage": 5 + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json index 511a3685f4..ae35f523af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json @@ -26,7 +26,7 @@ "human_like" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:rabbit_hide", @@ -40,6 +40,9 @@ { "item": "cobblemon:charcoal_stick", "percentage": 10 + }, + { + "item": "minecraft:rabbit" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json index dfe2cf6aa0..bd6e68934d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json @@ -78,11 +78,11 @@ "entries": [ { "item": "minecraft:stick", - "maxSelectableTimes": 2 + "quantityRange": "1-2" }, { "item": "cobblemon:miracle_seed", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json index 7a35edb5ed..6405799eeb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json @@ -9,7 +9,7 @@ "h:bigpecks" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:feather", @@ -17,6 +17,10 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:wacan_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json index c13ef8f3ab..4fdeab9d1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json @@ -26,7 +26,7 @@ "human_like" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:rabbit_hide", @@ -39,6 +39,9 @@ { "item": "cobblemon:charcoal_stick", "percentage": 5 + }, + { + "item": "minecraft:rabbit" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index db5edc12bc..fd175f4e75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -8,12 +8,22 @@ "h:scrappy" ], "drops": { - "amount": 1, + "amount": 4, "entries": [ { - "item": "cobblemon:medicinal_leek", - "percentage": 20, - "quantityRange": "1-5" + "item": "cobblemon:medicinal_leek" + }, + { + "item": "minecraft:feather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:coba_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json index 61a3c22230..1284840c8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json @@ -35,11 +35,15 @@ } }, "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:blaze_powder", "percentage": 2.5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json index 9efec8b27c..12ba9f3c02 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json @@ -13,11 +13,15 @@ "entries": [ { "item": "minecraft:sweet_berries", - "quantityRange": "3-5" + "quantityRange": "2-4" }, { "item": "minecraft:emerald", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json index 2a96d01c83..c7a56912d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json @@ -30,7 +30,8 @@ "entries": [ { "item": "minecraft:stick", - "maxSelectableTimes": 2 + "percentage": 66, + "quantityRange": "1-2" }, { "item": "cobblemon:miracle_seed", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json b/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json index 38f3afc55a..654067f7fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json @@ -9,6 +9,27 @@ "bulletproof", "h:unnerve" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "3-5" + }, + { + "item": "minecraft:honey_bottle", + "percentage": 10 + }, + { + "item": "cobblemon:peat_block", + "percentage": 10 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 130, "attack": 140, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json index 859e799f9b..a24d7e9f30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json @@ -33,8 +33,7 @@ "entries": [ { "item": "minecraft:mutton", - "quantityRange": "1-2", - "percentage": 66 + "quantityRange": "1-2" }, { "item": "minecraft:white_wool" diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json b/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json index 41e3c9f56c..d23587bdf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json @@ -50,6 +50,10 @@ "item": "minecraft:leather", "quantityRange": "1-2", "percentage": 66 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json index f11667aafe..d7ad54b599 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json @@ -15,7 +15,7 @@ "percentage": 50 }, { - "item": "cobblemon:shuca_berry", + "item": "cobblemon:wepear_berry", "percentage": 2.5 } ] From 951a36f82e9187d028e4dea54097f489a5cb4c17 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 14:22:51 +0000 Subject: [PATCH 29/40] gen 9 drops --- .../species/generation9/annihilape.json | 13 +++++++++++ .../species/generation9/armarouge.json | 22 +++++++++++++++++++ .../species/generation9/ceruledge.json | 22 +++++++++++++++++++ .../species/generation9/cetitan.json | 14 ++++++++++++ .../species/generation9/cetoddle.json | 13 +++++++++++ .../species/generation9/charcadet.json | 17 ++++++++++++++ .../species/generation9/clodsire.json | 14 ++++++++++++ .../species/generation9/crocalor.json | 9 ++++++++ .../species/generation9/dachsbun.json | 14 ++++++++++++ .../species/generation9/espathra.json | 12 ++++++++++ .../species/generation9/fidough.json | 13 +++++++++++ .../species/generation9/flittle.json | 12 ++++++++++ .../species/generation9/floragato.json | 9 ++++++++ .../species/generation9/fuecoco.json | 9 ++++++++ .../species/generation9/garganacl.json | 8 +++++-- .../species/generation9/glimmet.json | 13 +++++++++++ .../species/generation9/glimmora.json | 14 ++++++++++++ .../species/generation9/grafaiai.json | 9 ++++++++ .../species/generation9/lechonk.json | 13 +++++++++++ .../species/generation9/mabosstiff.json | 19 ++++++++++++++++ .../species/generation9/maschiff.json | 17 ++++++++++++++ .../species/generation9/maushold.json | 14 ++++++++++++ .../species/generation9/meowscarada.json | 9 ++++++++ .../cobblemon/species/generation9/nacli.json | 8 +++++-- .../species/generation9/naclstack.json | 12 ++++++---- .../species/generation9/oinkologne.json | 14 ++++++++++++ .../species/generation9/quaquaval.json | 9 ++++++++ .../cobblemon/species/generation9/quaxly.json | 9 ++++++++ .../species/generation9/quaxwell.json | 9 ++++++++ .../species/generation9/revavroom.json | 18 +++++++++++++++ .../species/generation9/shroodle.json | 9 ++++++++ .../species/generation9/skeledirge.json | 9 ++++++++ .../species/generation9/sprigatito.json | 9 ++++++++ .../species/generation9/squawkabilly.json | 17 ++++++++++++++ .../species/generation9/tandemaus.json | 13 +++++++++++ .../species/generation9/tatsugiri.json | 6 ++++- .../species/generation9/tinkatink.json | 13 +++++++++++ .../species/generation9/tinkaton.json | 14 ++++++++++++ .../species/generation9/tinkatuff.json | 14 ++++++++++++ .../cobblemon/species/generation9/varoom.json | 17 ++++++++++++++ 40 files changed, 500 insertions(+), 9 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json index 07ec9b6fa7..8c045cf71a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json @@ -9,6 +9,19 @@ "innerfocus", "h:defiant" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:muscle_band", + "percentage": 10 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 110, "attack": 115, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json index b9da38ffed..f550cfcd0e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json @@ -8,6 +8,28 @@ "flashfire", "h:weakarmor" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:charcoal", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + }, + { + "item": "cobblemon:auspicious_armor", + "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 85, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json index fe36e47205..732239b4aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json @@ -8,6 +8,28 @@ "flashfire", "h:weakarmor" ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:charcoal", + "quantityRange": "1-2", + "percentage": 66 + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + }, + { + "item": "cobblemon:malicious_armor", + "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 125, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json index 16b66000a2..ee0ffc3c55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json @@ -8,6 +8,20 @@ "slushrush", "h:sheerforce" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone_block", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 170, "attack": 113, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json b/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json index b28c35cd15..d825048f5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json @@ -8,6 +8,19 @@ "snowcloak", "h:sheerforce" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bone_block", + "percentage": 50 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 108, "attack": 68, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json index 9c8ec8a758..379b72c4da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json @@ -7,6 +7,23 @@ "flashfire", "h:flamebody" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:charcoal", + "percentage": 50 + }, + { + "item": "cobblemon:charcoal_stick", + "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json index 5bdf1391e8..b936fa92a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json @@ -9,6 +9,20 @@ "waterabsorb", "h:unaware" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:clay_ball", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 130, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json index 7da2984fc5..1fcec7435d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json @@ -7,6 +7,15 @@ "blaze", "h:unaware" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 81, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json index 66000bf016..64ae54f046 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json @@ -7,6 +7,20 @@ "wellbakedbody", "h:aromaveil" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bread", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 57, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json index 5d58acd7e6..26f06a2352 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json @@ -8,6 +8,18 @@ "frisk", "h:speedboost" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 95, "attack": 60, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fidough.json b/common/src/main/resources/data/cobblemon/species/generation9/fidough.json index aade73a3e9..2805c6d0ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fidough.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fidough.json @@ -7,6 +7,19 @@ "owntempo", "h:klutz" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:bread", + "percentage": 50 + }, + { + "item": "cobblemon:nanab_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 37, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flittle.json b/common/src/main/resources/data/cobblemon/species/generation9/flittle.json index 2cdc84e924..1fb15e1c62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/flittle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/flittle.json @@ -8,6 +8,18 @@ "frisk", "h:speedboost" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 30, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json index fe7f2e0f64..400021abbd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json @@ -7,6 +7,15 @@ "overgrow", "h:protean" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 61, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json index 1722b0c148..bc7bd3f7bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json @@ -7,6 +7,15 @@ "blaze", "h:unaware" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 67, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json index 92e258db1c..ceb08d118a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json @@ -41,12 +41,16 @@ } }, "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:quartz", "quantityRange": "1-3", "percentage": 75 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json index 7bec788197..c0414ad29d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json @@ -8,6 +8,19 @@ "toxicdebris", "h:corrosion" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:amethyst_shard", + "percentage": 50 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 48, "attack": 35, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json index 43d90dda9d..f29e4ef770 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json @@ -8,6 +8,20 @@ "toxicdebris", "h:corrosion" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:amethyst_shard", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 83, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json index ab10460237..52619623e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json @@ -9,6 +9,15 @@ "poisontouch", "h:prankster" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:nanab_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 63, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json b/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json index aba40e6468..161da80636 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json @@ -8,6 +8,19 @@ "gluttony", "h:thickfat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:porkchop", + "quantityRange": "1-2" + }, + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 54, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json index 3466542298..9de6b64d74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json @@ -8,6 +8,25 @@ "guarddog", "h:stakeout" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 80, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json index b3ed9ec35f..9bf76a881c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json @@ -8,6 +8,23 @@ "runaway", "h:stakeout" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:bone", + "percentage": 50 + }, + { + "item": "minecraft:rotten_flesh", + "percentage": 50 + }, + { + "item": "cobblemon:tanga_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 60, "attack": 78, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json index d55cd55a8b..0ae16ad840 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json @@ -8,6 +8,20 @@ "cheekpouch", "h:technician" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:wheat_seeds", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 74, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json index f5d19844b4..d074282168 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json @@ -8,6 +8,15 @@ "overgrow", "h:protean" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 76, "attack": 110, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json index 6f81ae8aa6..917c8e6dbc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json @@ -47,11 +47,15 @@ "mineral" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:quartz", "percentage": 50 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json index ea89539352..699861785e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json @@ -47,12 +47,16 @@ "mineral" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "minecraft:flint", - "quantityRange": "1-2", - "percentage": 66 + "item": "minecraft:quartz", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json index fdce2688ac..de6d36bb55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json @@ -8,6 +8,20 @@ "gluttony", "h:thickfat" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:porkchop", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:oran_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 110, "attack": 100, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json index cebf1f1237..44c46275e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json @@ -8,6 +8,15 @@ "torrent", "h:moxie" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 85, "attack": 120, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json index c466da4e46..346d08a082 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json @@ -7,6 +7,15 @@ "torrent", "h:moxie" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 55, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json index 91bcaf1886..2bf243503f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json @@ -7,6 +7,15 @@ "torrent", "h:moxie" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 70, "attack": 85, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json index eec4750d73..e62996d06e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json @@ -8,6 +8,24 @@ "overcoat", "h:filter" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:iron_nugget", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:black_sludge", + "percentage": 5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 80, "attack": 119, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json b/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json index efe7031a1e..4c71968f01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json @@ -9,6 +9,15 @@ "pickpocket", "h:prankster" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:nanab_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 40, "attack": 65, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json index 7d037cf734..99ab08dfca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json @@ -8,6 +8,15 @@ "blaze", "h:unaware" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:charcoal_stick", + "percentage": 25 + } + ] + }, "baseStats": { "hp": 104, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json index 37902d6e39..3b4ed0f0e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json @@ -7,6 +7,15 @@ "overgrow", "h:protean" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 40, "attack": 61, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json index a26ed23a48..883919046e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json @@ -9,6 +9,23 @@ "hustle", "h:guts" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:feather", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 82, "attack": 96, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json index 341cf1705b..0322109b27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json @@ -8,6 +8,19 @@ "pickup", "h:owntempo" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:wheat_seeds", + "percentage": 50 + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 50, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index c023d9deb6..3652196531 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -43,7 +43,7 @@ } }, "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:salmon" @@ -51,6 +51,10 @@ { "item": "minecraft:bone_meal", "percentage": 5 + }, + { + "item": "cobblemon:haban_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json index 5802525163..bfcb5ec454 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json @@ -9,6 +9,19 @@ "owntempo", "h:pickpocket" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 50 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 45, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json index ee460f3b21..8cb80c0927 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json @@ -9,6 +9,20 @@ "owntempo", "h:pickpocket" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:razz_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 85, "attack": 75, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json index 279299bc88..fab56f89fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json @@ -9,6 +9,20 @@ "owntempo", "h:pickpocket" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:raw_iron", + "percentage": 66, + "quantityRange": "1-2" + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 65, "attack": 55, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/varoom.json b/common/src/main/resources/data/cobblemon/species/generation9/varoom.json index 5bb28493c9..16f1d2f247 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/varoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/varoom.json @@ -8,6 +8,23 @@ "overcoat", "h:slowstart" ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:iron_nugget", + "percentage": 50 + }, + { + "item": "cobblemon:black_sludge", + "percentage": 2.5 + }, + { + "item": "cobblemon:shuca_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 45, "attack": 70, From 48f8561662af117865eef779385e291d0e1823e4 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 14:44:16 +0000 Subject: [PATCH 30/40] fixed typos --- .../resources/data/cobblemon/species/generation5/cryogonal.json | 2 +- .../resources/data/cobblemon/species/generation5/elgyem.json | 2 +- .../resources/data/cobblemon/species/generation5/frillish.json | 2 +- .../resources/data/cobblemon/species/generation5/garbodor.json | 2 +- .../resources/data/cobblemon/species/generation5/mandibuzz.json | 2 +- .../resources/data/cobblemon/species/generation5/sandile.json | 2 +- .../main/resources/data/cobblemon/species/generation5/sawk.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json index 77862d9eab..d40abd0f8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json @@ -10,7 +10,7 @@ "amount": 2, "entries": [ { - "item": "cobblemon:nevermelt_ice", + "item": "cobblemon:never_melt_ice", "percentage": 5 }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json index c669167bf8..a1563d24eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json @@ -9,7 +9,7 @@ "h:analytic" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:ender_pearl", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json index 92cc52bd44..e3991cb9fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json @@ -12,7 +12,7 @@ "amount": 2, "entries": [ { - "item": "minecraft:glow_inc_sac", + "item": "minecraft:glow_ink_sac", "percentage": 50 }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json index 9a7268ba4b..9a5d6aa440 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json @@ -19,7 +19,7 @@ "percentage": 5 }, { - "item": "minecraft:silk_scarf", + "item": "cobblemon:silk_scarf", "percentage": 5 }, { 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 9cfa092677..0f8ffa523e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -17,7 +17,7 @@ "percentage": 66 }, { - "item": "cobblemon:rotten_flesh", + "item": "minecraft:rotten_flesh", "quantityRange": "1-2", "percentage": 66 }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json index 1e558cd34b..c118b08def 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json @@ -16,7 +16,7 @@ "percentage": 2.5 }, { - "item": "minecraft:tanga_berry", + "item": "cobblemon:tanga_berry", "percentage": 2.5 } 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 b35dc5e1d5..67d962d404 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -15,7 +15,7 @@ "percentage": 5 }, { - "item": "minecraft:bluk_berry", + "item": "cobblemon:bluk_berry", "percentage": 5 } From c9367f63b4c5fb8aa04b713761931a076c18e7bf Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 15:30:15 +0000 Subject: [PATCH 31/40] only 6 pokemon drops because my IDE broke and i dont wanna lose these --- .../cobblemon/species/generation6/aegislash.json | 13 +++++++++++-- .../data/cobblemon/species/generation6/avalugg.json | 7 +++---- .../cobblemon/species/generation6/bergmite.json | 4 ++-- .../cobblemon/species/generation6/bunnelby.json | 13 ++++++++++--- .../cobblemon/species/generation6/chesnaught.json | 2 +- .../data/cobblemon/species/generation6/delphox.json | 2 +- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json index 6018e6e686..f697a64370 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json @@ -34,11 +34,20 @@ "mineral" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { "item": "minecraft:iron_sword", - "percentage": 20 + "percentage": 25 + }, + { + "item": "minecraft:iron_nugget", + "percentage": 75, + "quantityRange": "1-3" + }, + { + "item": "cobblemon:dusk_stone", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json index 1e52495a27..26131e73e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json @@ -12,13 +12,12 @@ "amount": 2, "entries": [ { - "item": "minecraft:blue_ice", - "percentage": 66, - "quantityRange": "1-2" + "item": "cobblemon:aspear_berry", + "percentage": 5 }, { "item": "cobblemon:never_melt_ice", - "percentage": 10 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json index 1b9f5d2342..76e32fc11b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json @@ -12,8 +12,8 @@ "amount": 2, "entries": [ { - "item": "minecraft:blue_ice", - "percentage": 50 + "item": "cobblemon:aspear_berry", + "percentage": 2.5 }, { "item": "cobblemon:never_melt_ice", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json index 685fa24e7c..b85b44fcaa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json @@ -9,19 +9,26 @@ "h:hugepower" ], "drops": { - "amount": 3, + "amount": 5, "entries": [ { "item": "minecraft:carrot", - "percentage": 50 + "percentage": 2.5 }, { "item": "minecraft:rabbit_hide", - "percentage": 5 + "percentage": 50 }, { "item": "minecraft:rabbit_foot", "percentage": 2.5 + }, + { + "item": "minecraft:rabbit" + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json index 11445e7754..e89ec5d966 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json @@ -38,7 +38,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json index 328604c0c4..d577d65fcf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json @@ -45,7 +45,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 20 + "percentage": 25 } ] }, From 267c14cdd5729ce9bade62614176884d8018e909 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 15:45:39 +0000 Subject: [PATCH 32/40] and here's 14 more because my IDE broke again somehow --- .../species/generation6/diggersby.json | 18 ++++++++++++------ .../species/generation6/doublade.json | 13 +++++++++++-- .../species/generation6/dragalge.json | 6 +++++- .../species/generation6/fennekin.json | 5 +---- .../species/generation6/fletchinder.json | 6 +++++- .../species/generation6/fletchling.json | 6 +++++- .../species/generation6/gourgeist.json | 8 ++++++-- .../species/generation6/greninja.json | 2 +- .../cobblemon/species/generation6/honedge.json | 12 ++++++++++-- .../species/generation6/phantump.json | 6 +++++- .../species/generation6/pumpkaboo.json | 6 +++++- .../species/generation6/scatterbug.json | 10 +++++++++- .../cobblemon/species/generation6/skrelp.json | 6 +++++- .../cobblemon/species/generation6/spewpa.json | 10 +++++++++- 14 files changed, 89 insertions(+), 25 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json index 8f2e5a83e7..c332b8efaa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json @@ -10,20 +10,26 @@ "h:hugepower" ], "drops": { - "amount": 3, + "amount": 5, "entries": [ { - "item": "minecraft:carrot", - "percentage": 66, - "quantityRange": "1-2" + "item": "minecraft:rabbit" }, { "item": "minecraft:rabbit_hide", - "percentage": 10 + "percentage": 50 }, { "item": "minecraft:rabbit_foot", - "percentage": 5 + "percentage": 2.5 + }, + { + "item": "minecraft:carrot", + "percentage": 2.5 + }, + { + "item": "cobblemon:chilan_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json index ad959bea09..ad45b84dee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json @@ -25,11 +25,20 @@ "mineral" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ + { + "item": "minecraft:iron_nugget", + "percentage": 66, + "quantityRange": "1-2" + }, { "item": "minecraft:iron_sword", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:dusk_stone", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json index 2fa89297c5..990cde3de7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json @@ -10,12 +10,16 @@ "h:adaptability" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:kelp", "percentage": 66, "quantityRange": "1-2" + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json index 60345e7980..40192ac893 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json @@ -32,11 +32,8 @@ } }, "drops": { - "amount": 3, + "amount": 2, "entries": [ - { - "item": "minecraft:stick" - }, { "item": "minecraft:blaze_powder", "percentage": 50 diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json index 5538f96513..b4a7ca6718 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json @@ -9,7 +9,7 @@ "h:galewings" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -22,6 +22,10 @@ { "item": "cobblemon:sharp_beak", "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json index 4d4cc4002e..cc5c7072ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json @@ -9,7 +9,7 @@ "h:galewings" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:feather", @@ -17,6 +17,10 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json index 6551e85e66..c1f698102b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json @@ -189,7 +189,7 @@ "amorphous" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:pumpkin_seeds", @@ -198,7 +198,11 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index de0baacce8..c3a1bae632 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -18,7 +18,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json index 6d9ce836d4..1f6e3a0c84 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json @@ -25,11 +25,19 @@ "mineral" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { "item": "minecraft:iron_sword", - "percentage": 5 + "percentage": 2.5 + }, + { + "item": "minecraft:iron_nugget", + "percentage": 50 + }, + { + "item": "cobblemon:dusk_stone", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json index 585f6e3359..1fa961208f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json @@ -10,11 +10,15 @@ "h:harvest" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json index a9bb927257..1aa42981e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json @@ -302,7 +302,7 @@ "amorphous" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:pumpkin_seeds", @@ -311,6 +311,10 @@ { "item": "cobblemon:miracle_seed", "percentage": 2.5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json index 35c2dbf1f2..28777daf7b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json @@ -9,11 +9,19 @@ "h:friendguard" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { "item": "minecraft:string", "percentage": 50 + }, + { + "item": "cobblemon:bright_powder", + "percentage": 2.5 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json index daecbfba12..d1de7a86fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json @@ -10,11 +10,15 @@ "h:adaptability" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "minecraft:kelp", "percentage": 50 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json index 2c9c8c3f37..ee8d9a7ff0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json @@ -8,12 +8,20 @@ "h:friendguard" ], "drops": { - "amount": 1, + "amount": 3, "entries": [ { "item": "minecraft:string", "percentage": 66, "quantityRange": "1-2" + }, + { + "item": "cobblemon:bright_powder", + "percentage": 2.5 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 } ] }, From 51a3d686ff18f7eb4dd395395482d2f3264b3c39 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 15:47:42 +0000 Subject: [PATCH 33/40] gen 6 drops done --- .../data/cobblemon/species/generation6/talonflame.json | 6 +++++- .../data/cobblemon/species/generation6/trevenant.json | 8 ++++++-- .../data/cobblemon/species/generation6/vivillon.json | 10 +++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json index bde75f2465..ae25b943d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json @@ -9,7 +9,7 @@ "h:galewings" ], "drops": { - "amount": 3, + "amount": 4, "entries": [ { "item": "minecraft:feather", @@ -22,6 +22,10 @@ { "item": "cobblemon:sharp_beak", "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json index 91e39f80f4..729413fdf6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json @@ -10,11 +10,15 @@ "h:harvest" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json index 3f932d14c8..5f44767d4f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json @@ -10,11 +10,15 @@ "h:friendguard" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { - "item": "cobblemon:silver_powder", - "percentage": 2.5 + "item": "cobblemon:bright_powder", + "percentage": 5 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5 } ] }, From 03b0bb9937ad1a24d7b6f25ccff78e6aa29261c0 Mon Sep 17 00:00:00 2001 From: Lily Date: Tue, 10 Oct 2023 18:23:58 +0000 Subject: [PATCH 34/40] a bunch of missed pokemon drops --- .../species/generation2/bellossom.json | 9 +++++++++ .../cobblemon/species/generation2/blissey.json | 7 +++---- .../cobblemon/species/generation2/cleffa.json | 6 +++++- .../cobblemon/species/generation2/crobat.json | 13 +++++++++++++ .../species/generation2/hitmontop.json | 6 +++++- .../cobblemon/species/generation2/politoed.json | 11 +++++++++-- .../cobblemon/species/generation2/porygon2.json | 2 +- .../cobblemon/species/generation2/scizor.json | 4 ++-- .../cobblemon/species/generation2/smoochum.json | 2 +- .../cobblemon/species/generation2/steelix.json | 2 +- .../cobblemon/species/generation2/tyrogue.json | 6 +++++- .../cobblemon/species/generation4/bonsly.json | 13 +++++++++++++ .../cobblemon/species/generation4/gliscor.json | 17 +++++++++++++++++ .../species/generation4/honchkrow.json | 6 +++++- .../species/generation4/mamoswine.json | 10 +++++++++- .../cobblemon/species/generation4/mimejr.json | 6 +++++- .../species/generation4/mismagius.json | 8 ++++++-- .../cobblemon/species/generation4/porygonz.json | 2 +- .../cobblemon/species/generation4/weavile.json | 10 +++++++--- 19 files changed, 117 insertions(+), 23 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json index e04fa3cece..0a68d81fe5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json @@ -7,6 +7,15 @@ "chlorophyll", "h:healer" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:pecha_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 75, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json index 2e7c6c4527..133033a7c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json @@ -30,15 +30,14 @@ "entries": [ { "item": "cobblemon:lucky_egg", - "percentage": 20 + "percentage": 25 }, { "item": "cobblemon:oval_stone", - "percentage": 20 + "percentage": 25 }, { - "item": "minecraft:egg", - "percentage": 50 + "item": "minecraft:egg" } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json index d844c039cd..e38ad986bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json @@ -26,11 +26,15 @@ "undiscovered" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:moon_stone", "percentage": 2.5 + }, + { + "item": "cobblemon:babiri_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json index 667591e62b..ac9bf55675 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json @@ -8,6 +8,19 @@ "innerfocus", "h:infiltrator" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:razor_fang", + "percentage": 10 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 10 + } + ] + }, "baseStats": { "hp": 85, "attack": 90, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json index 621cd8c31d..736ae94db7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json @@ -26,11 +26,15 @@ "human_like" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:black_belt", "percentage": 5 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json index 65b47b0eeb..4ff1d9d931 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json @@ -34,11 +34,18 @@ } }, "drops": { - "amount": 1, + "amount": 3, "entries": [ + { + "item": "minecraft:verdant_froglight" + }, { "item": "cobblemon:kings_rock", - "percentage": 20 + "percentage": 10 + }, + { + "item": "cobblemon:chesto_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json index f8bb43d261..011581d35b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json @@ -30,7 +30,7 @@ "entries": [ { "item": "cobblemon:upgrade", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json index 4c3257767c..6ac8bde89b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json @@ -84,8 +84,8 @@ "amount": 1, "entries": [ { - "item": "cobblemon:metal_coat", - "percentage": 10 + "item": "cobblemon:wepear_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json index 38a4128944..c49a689a84 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json @@ -10,7 +10,7 @@ "h:hydration" ], "drops": { - "amount": 2, + "amount": 1, "entries": [ { "item": "cobblemon:aspear_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json index dc8a9dcd1c..f8ed1b8c74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json @@ -74,7 +74,7 @@ "mineral" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:raw_iron", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json index 8e0b6f9090..619419139a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json @@ -26,11 +26,15 @@ "undiscovered" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:black_belt", "percentage": 2.5 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json b/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json index f3d80144c3..aa9e26c21b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json @@ -8,6 +8,19 @@ "rockhead", "h:rattled" ], + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:hard_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 + } + ] + }, "baseStats": { "hp": 50, "attack": 80, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json index 8e458f3e95..ea35747e5e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json @@ -9,6 +9,23 @@ "sandveil", "h:poisonheal" ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:razor_fang", + "percentage": 10 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 10 + }, + { + "item": "cobblemon:yache_berry", + "percentage": 5 + } + ] + }, "baseStats": { "hp": 75, "attack": 95, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json index 1a8620dd6c..28e1c17270 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json @@ -38,7 +38,7 @@ "flying" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "minecraft:feather", @@ -47,6 +47,10 @@ }, { "item": "minecraft:chicken" + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index 69ba4ad77d..6837d2e125 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -10,7 +10,7 @@ "h:thickfat" ], "drops": { - "amount": 2, + "amount": 4, "entries": [ { "item": "minecraft:porkchop", @@ -19,6 +19,14 @@ { "item": "minecraft:brown_wool", "quantityRange": "2-3" + }, + { + "item": "cobblemon:never_melt_ice", + "percentage": 10 + }, + { + "item": "cobblemon:aspear_berry", + "percentage": 10 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index bb83a5b512..8e6f2fb032 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -10,11 +10,15 @@ "h:technician" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:light_clay", "percentage": 2.5 + }, + { + "item": "cobblemon:babiri_berry", + "percentage": 2.5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index 987caad7bd..5449f4904b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -7,11 +7,15 @@ "levitate" ], "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json index 269d847dd0..cf10f9ff27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json @@ -13,7 +13,7 @@ "entries": [ { "item": "cobblemon:dubious_disc", - "percentage": 20 + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index dfc6854ed3..b2051ee709 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -9,15 +9,19 @@ "h:pickpocket" ], "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 10 + "percentage": 5 }, { "item": "cobblemon:quick_claw", - "percentage": 10 + "percentage": 5 + }, + { + "item": "cobblemon:chople_berry", + "percentage": 5 } ] }, From d553332017f3ede47ae42d8e5e8eb7dba1d18543 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Tue, 10 Oct 2023 20:46:14 -0400 Subject: [PATCH 35/40] Fixed Icy snow and High plains Vivillon not spawning as Meadow. Also fixed Spewpa evolving into Meadow instead of Icy and High Plains. Updated Alolan Exeggutor model, animations, and texture. Updated Boltund animation, updated Raticate models and animations. Added Stufful and Bewears shiny textures. --- .../pokemon/gen1/ExeggutorAlolanModel.kt | 8 +- .../blockbench/pokemon/gen1/ExeggutorModel.kt | 8 +- .../0020_raticate/raticate.animation.json | 660 ++++------ .../raticate_alolan.animation.json | 725 +++++++++++ .../0103_exeggutor/exeggutor.animation.json | 1109 ++++++++--------- .../exeggutor_alolan.animation.json | 251 ++-- .../0836_boltund/boltund.animation.json | 35 +- .../0020_raticate/raticate_alolan.geo.json | 209 ++-- .../0020_raticate/raticate_female.geo.json | 77 +- .../0020_raticate/raticate_male.geo.json | 77 +- .../models/0103_exeggutor/exeggutor.geo.json | 691 +++++----- .../0103_exeggutor/exeggutor_alolan.geo.json | 496 ++++---- .../0759_stufful/0_stufful_base.json | 10 +- .../resolvers/0760_bewear/0_bewear_base.json | 10 +- .../pokemon/0103_exeggutor/exeggutor.png | Bin 3445 -> 11370 bytes .../0103_exeggutor/exeggutor_alolan.png | Bin 7024 -> 23561 bytes .../0103_exeggutor/exeggutor_alolan_shiny.png | Bin 7316 -> 23298 bytes .../0103_exeggutor/exeggutor_shiny.png | Bin 3540 -> 11360 bytes .../pokemon/0759_stufful/stufful_shiny.png | Bin 0 -> 1936 bytes .../pokemon/0760_bewear/bewear_shiny.png | Bin 0 -> 5721 bytes .../spawn_pool_world/0666_vivillon.json | 4 +- .../species/generation1/exeggutor.json | 24 +- .../cobblemon/species/generation6/spewpa.json | 61 +- .../species/generation6/vivillon.json | 2 +- 24 files changed, 2514 insertions(+), 1943 deletions(-) create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0759_stufful/stufful_shiny.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0760_bewear/bewear_shiny.png diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt index 8ffb8780b7..b2b9531033 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt @@ -36,11 +36,11 @@ class ExeggutorAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFram override val head: ModelPart = getPart("head3") } - override val portraitScale = 1.9F - override val portraitTranslation = Vec3d(-1.3, 11.5, 0.0) + override val portraitScale = 1.0F + override val portraitTranslation = Vec3d(-1.4, 16.55, 0.0) - override val profileScale = 0.9F - override val profileTranslation = Vec3d(0.0, 0.38, 0.0) + override val profileScale = 0.45F + override val profileTranslation = Vec3d(0.0, 1.0, 0.0) lateinit var standing: PokemonPose lateinit var walk: PokemonPose diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt index 091eff2fbc..d598908fa9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt @@ -38,11 +38,11 @@ class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip override val head: ModelPart = getPart("head3") } - override val portraitScale = 2.1F - override val portraitTranslation = Vec3d(-1.0, 0.5, 0.0) + override val portraitScale = 1.2F + override val portraitTranslation = Vec3d(-1.0, 1.77, 0.0) - override val profileScale = 0.75F - override val profileTranslation = Vec3d(0.0, 0.65, 0.0) + override val profileScale = 0.45F + override val profileTranslation = Vec3d(0.0, 1.1, 0.0) lateinit var standing: PokemonPose lateinit var walk: PokemonPose diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate.animation.json index 90e9e9bb32..bd4bcc36d9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate.animation.json @@ -1,91 +1,6 @@ { "format_version": "1.8.0", "animations": { - "animation.raticate_male.render": { - "loop": true, - "bones": { - "head": { - "rotation": [-5, 0, 0] - }, - "hand_right": { - "rotation": [-17.5, 0, 0] - }, - "finger_right1": { - "rotation": [17.5, 0, 0] - }, - "finger_right2": { - "rotation": [10, 0, 0] - }, - "finger_right3": { - "rotation": [15, 0, 0] - }, - "hand_left": { - "rotation": [-27.5, 0, 0] - }, - "finger_left1": { - "rotation": [27.5, 0, 0] - }, - "finger_left2": { - "rotation": [22.5, 0, 0] - }, - "finger_left3": { - "rotation": [32.5, 0, 0] - }, - "foot_right": { - "rotation": [0, 15, 0] - }, - "foot_left": { - "rotation": [0, -12.5, 0] - }, - "tail": { - "rotation": [20.22183, 9.6955, 1.73294] - }, - "tail2": { - "rotation": [30, 7.5, 0] - }, - "tail4": { - "rotation": [20, 0, 0] - } - } - }, - "animation.raticate.cry": { - "animation_length": 0.66667, - "bones": { - "head": { - "rotation": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": [-12.5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": [-5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": [-10, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": [-7.5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.4583": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "pokemon.raticate.cry" - } - } - }, "animation.raticate.ground_idle": { "loop": true, "bones": { @@ -94,7 +9,7 @@ "position": [0, "0.775-math.sin(q.anim_time*90*4-90)*0.275", "math.sin(q.anim_time*90*4-90)*0.2"] }, "head": { - "rotation": ["-2.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0] + "rotation": ["-5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0] }, "ear_right": { "rotation": [0, "math.sin(q.anim_time*90*8*2)*2", 0] @@ -105,27 +20,15 @@ "hand_right": { "rotation": [ "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ] - }, - "hand_left": { - "rotation": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + -25, + "80-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" ] }, "foot_right": { - "rotation": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0] + "rotation": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "position": ["-(math.sin(q.anim_time*90*4+90)*0.05)", 0, "math.sin(q.anim_time*90*4+90)*0.02"] }, - "toe_right": { - "rotation": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0] - }, - "foot_left": { - "rotation": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0] - }, - "toe_left": { + "toes_right": { "rotation": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0] }, "tail": { @@ -140,35 +43,56 @@ "tail4": { "rotation": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0] }, - "finger_right1": { - "rotation": ["45-math.sin(q.anim_time*90*4+90)*15", 0, 0] + "whiskers_right": { + "rotation": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0] }, - "finger_right2": { - "rotation": ["35-math.sin(q.anim_time*90*4+90)*20", 0, 0] + "arm_right": { + "rotation": [5, -55, -55] }, - "finger_right3": { - "rotation": ["45-math.sin(q.anim_time*90*4+90)*25", 0, 0] + "finger_back_right": { + "rotation": [0, 0, "-45+math.sin(q.anim_time*90*4+90)*15"] }, - "finger_left1": { - "rotation": ["45-math.sin(q.anim_time*90*4+90)*25", 0, 0] + "finger_front_right": { + "rotation": [0, 0, "-45+math.sin(q.anim_time*90*4+90)*25"] }, - "finger_left2": { - "rotation": ["35-math.sin(q.anim_time*90*4+90)*20", 0, 0] + "finger_middle_right": { + "rotation": [0, 0, "-35+math.sin(q.anim_time*90*4+90)*20"] }, - "finger_left3": { - "rotation": ["45-math.sin(q.anim_time*90*4+90)*15", 0, 0] + "foot_left": { + "rotation": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "position": ["math.sin(q.anim_time*90*4+90)*0.05", 0, "math.sin(q.anim_time*90*4+90)*0.02"] }, - "whiskers_right": { - "rotation": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0] + "toes_left": { + "rotation": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0] }, - "whiskers_bottom_right": { - "rotation": [0, "-math.sin(q.anim_time*90*8*2+90)*2", 0] + "arm_left": { + "rotation": [5, 55, 55] }, - "whiskers_left": { - "rotation": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0] + "hand_left": { + "rotation": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", + 25, + "-80-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "position": [0, 0, -0.2] }, - "whiskers_bottom_left": { + "finger_back_left": { + "rotation": [0, 0, "45-math.sin(q.anim_time*90*4+90)*15"] + }, + "finger_middle_left": { + "rotation": [0, 0, "35-math.sin(q.anim_time*90*4+90)*20"] + }, + "finger_front_left": { + "rotation": [0, 0, "45-math.sin(q.anim_time*90*4+90)*25"] + }, + "whiskers_lower_right": { + "rotation": [0, "-math.sin(q.anim_time*90*8*2+90)*2", 0] + }, + "whiskers_lower_left": { "rotation": [0, "math.sin(q.anim_time*90*8*2+90)*2", 0] + }, + "torso": { + "rotation": [-2.5, 0, 0] } } }, @@ -190,7 +114,7 @@ "head": { "rotation": [ "-math.clamp(math.sin(query.anim_time*180*4/2+20)*1,0.2,2)-math.clamp(-math.sin(query.anim_time*180*4/2+20)*1,0.2,2)-1", - "-math.sin(query.anim_time*90*4+20)*10", + "-math.sin(query.anim_time*90*4-10)*5", "-math.sin(query.anim_time*90*4+20)*2" ] }, @@ -201,10 +125,7 @@ "rotation": [0, "3*(math.sin(query.anim_time*90*8)*1-2)-math.sin(q.anim_time*90*8*2)*2", 0] }, "hand_right": { - "rotation": [-15, "-math.sin(query.anim_time*90*4+20)*10", "-(math.sin(query.anim_time*90*4+20)*1+2)*10"] - }, - "hand_left": { - "rotation": [-15, "-math.sin(query.anim_time*90*4+20)*10", "(math.sin(query.anim_time*90*4+20)*1+2)*10"] + "rotation": [-14.6567, "-1.2803+math.sin(query.anim_time*90*4+20)*10", "-4.8456-(math.sin(query.anim_time*90*4+20)*1+2)*4"] }, "foot_right": { "rotation": [ @@ -213,70 +134,82 @@ 0 ], "position": [ - 0, + 0.3, "-math.clamp(-math.sin(query.anim_time*90*4+20+180)*0.4,0.5,2)+math.clamp(-math.sin(query.anim_time*90*4-30)*1,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4+180)*2,1,2)+math.clamp(-math.sin(query.anim_time*90*4+100)*1.4,1,1.4)-2.8", "-math.clamp(math.sin(query.anim_time*90*4+180)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4+180)*0.4,-0.8,0)-0.1" ] }, - "toe_right": { + "toes_right": { "rotation": ["-11-math.clamp(math.sin(query.anim_time*90*4+50)*1,0,20)-math.clamp(math.sin(query.anim_time*90*4+90)*5,0,20)", 0, 0] }, - "foot_left": { - "rotation": [ - "-math.clamp(math.sin(query.anim_time*90*4+45)*10,-15,14)+math.clamp(-math.sin(query.anim_time*90*4+180*1)*12,5,12)-5", - "math.clamp(-math.sin(query.anim_time*90*4+180)*7.5,0,10)-math.clamp(-math.sin(query.anim_time*90*4+90+180)*2,0,10)-math.clamp(math.sin(query.anim_time*90*4+180*2)*25,0,30)", - 0 - ], - "position": [ - 0, - "-math.clamp(-math.sin(query.anim_time*90*4+20)*0.4,0.5,2)+math.clamp(-math.sin(query.anim_time*90*4-30+190)*1,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4)*2,1,2)+math.clamp(-math.sin(query.anim_time*90*4-80)*1.4,1,1.4)-2.8", - "-math.clamp(math.sin(query.anim_time*90*4)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4)*0.4,-0.8,0)-0.1" - ] - }, - "toe_left": { - "rotation": ["-11-math.clamp(math.sin(query.anim_time*90*4+50+180)*1,0,20)-math.clamp(math.sin(query.anim_time*90*4+90+180)*5,0,20)", 0, 0] - }, "tail": { - "rotation": ["-25+math.sin(query.anim_time*90*4-90)*2", "math.sin(query.anim_time*90*4-90)*10", 0] + "rotation": ["-25+math.sin(query.anim_time*90*8-160)*2", "math.sin(query.anim_time*90*4-20)*10", 0] }, "tail2": { - "rotation": [5, "math.sin(query.anim_time*90*4-90)*5", 0] + "rotation": [5, "math.sin(query.anim_time*90*4-120)*5", 0] }, "tail3": { - "rotation": [5, "math.sin(query.anim_time*90*4-90)*5", 0] + "rotation": [5, "math.sin(query.anim_time*90*4-150)*5", 0] }, "tail4": { - "rotation": [5, "math.sin(query.anim_time*90*4-90)*5", 0] + "rotation": [5, "math.sin(query.anim_time*90*4-190)*5", 0] }, - "finger_right1": { - "rotation": ["60-math.sin(q.anim_time*90*4+210)*10", 0, 0] + "whiskers_right": { + "rotation": [0, "-3*(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*3", 0] }, - "finger_right2": { - "rotation": ["50-math.sin(q.anim_time*90*4+210)*15", 0, 0] + "whiskers_bottom_right": { + "rotation": [0, "(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*2", 0] }, - "finger_right3": { - "rotation": ["60-math.sin(q.anim_time*90*4+210)*20", 0, 0] + "whiskers_bottom_left": { + "rotation": [0, "-(math.sin(query.anim_time*90*8+90)*1-5)-math.sin(q.anim_time*90*8*2+90)*2", 0] }, - "finger_left1": { - "rotation": ["60-math.sin(q.anim_time*90*4+60)*20", 0, 0] + "whiskers_left": { + "rotation": [0, "3*(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*3", 0] }, - "finger_left2": { - "rotation": ["50-math.sin(q.anim_time*90*4+60)*15", 0, 0] + "arm_right": { + "rotation": [0, "-62.5-math.sin(query.anim_time*90*4-50)*10", 0] }, - "finger_left3": { - "rotation": ["60-math.sin(q.anim_time*90*4+60)*10", 0, 0] + "finger_back_right": { + "rotation": [0, 0, -60] }, - "whiskers_right": { - "rotation": [0, "-3*(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*3", 0] + "finger_middle_right": { + "rotation": [0, 0, -45] }, - "whiskers_bottom_right": { - "rotation": [0, "(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*2", 0] + "finger_front_right": { + "rotation": [0, 0, -35] }, - "whiskers_left": { - "rotation": [0, "3*(math.sin(query.anim_time*90*8+90)*1-5)-math.sin(q.anim_time*90*8*2+90)*3", 0] + "arm_left": { + "rotation": [0, "62.5-math.sin(query.anim_time*90*4-50)*10", 0] }, - "whiskers_bottom_left": { - "rotation": [0, "-(math.sin(query.anim_time*90*8+90)*1-5)-math.sin(q.anim_time*90*8*2+90)*2", 0] + "hand_left": { + "rotation": [-14.6567, "1.2803+math.sin(query.anim_time*90*4+20)*10", "4.8456+(math.sin(query.anim_time*90*4+20)*1+2)*4"] + }, + "finger_back_left": { + "rotation": [0, 0, 60] + }, + "finger_middle_left": { + "rotation": [0, 0, 45] + }, + "finger_front_left": { + "rotation": [0, 0, 35] + }, + "foot_left": { + "rotation": [ + "-math.clamp(math.sin(query.anim_time*90*4+45)*10,-15,14)+math.clamp(-math.sin(query.anim_time*90*4+180*1)*12,5,12)-5", + "math.clamp(-math.sin(query.anim_time*90*4+180)*7.5,0,10)-math.clamp(-math.sin(query.anim_time*90*4+90+180)*2,0,10)-math.clamp(math.sin(query.anim_time*90*4+180*2)*25,0,30)", + 0 + ], + "position": [ + -0.3, + "-math.clamp(-math.sin(query.anim_time*90*4+20)*0.4,0.5,2)+math.clamp(-math.sin(query.anim_time*90*4-30+190)*1,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4)*2,1,2)+math.clamp(-math.sin(query.anim_time*90*4-80)*1.4,1,1.4)-2.8", + "-math.clamp(math.sin(query.anim_time*90*4)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4)*0.4,-0.8,0)-0.1" + ] + }, + "toes_left": { + "rotation": ["-11-math.clamp(math.sin(query.anim_time*90*4+50+180)*1,0,20)-math.clamp(math.sin(query.anim_time*90*4+90+180)*5,0,20)", 0, 0] + }, + "torso": { + "rotation": [0, "-math.sin(query.anim_time*90*4+20)*6", 0] } } }, @@ -325,7 +258,7 @@ }, "head": { "rotation": { - "0.0": ["20-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], + "0.0": ["12.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], "0.05": ["-27.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], "0.35": ["22.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], "0.4": ["25-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], @@ -389,141 +322,9 @@ 5, "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" ], - "0.15": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+30", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.3": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-45", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.45": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-45", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.55": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+25", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.65": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-25", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.85": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+32.5", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.0": [ - 20.84292, - 6.67898, - "-13.6908-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.25": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-25", - 5, - "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.45": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-64.4567", - -1.69506, - "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.7": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-64.4567", - -1.69506, - "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.85": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+40.5433", - -1.69506, - "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.9": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+0.5433", - -1.69506, - "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "2.0": [50.5433, -1.69506, -17.4303] + "1.8": [0, 0, -15] }, - "position": { - "0.0": [0, 0, 0], - "0.45": [0, 0.6, 0], - "1.0": [0, 0.6, 0], - "1.25": [0, 1.6, 0], - "1.7": [0, 1.6, 0], - "1.8": [0, -0.4, 0] - } - }, - "hand_left": { - "rotation": { - "0.0": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.15": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+45", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.3": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.45": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.55": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.65": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+17.5", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "0.85": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-47.5", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.25": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+11.7932", - -5, - "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.45": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-26.481", - 6.79887, - "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.7": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-26.481", - 6.79887, - "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.85": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+36.019", - 6.79887, - "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "1.9": [ - "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-1.481", - 6.79887, - "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" - ], - "2.0": [43.519, 6.79887, 13.1293] - } + "position": [0, 0, 0] }, "foot_right": { "rotation": { @@ -551,7 +352,7 @@ "1.9": [0, -0.2, 0] } }, - "toe_right": { + "toes_right": { "rotation": { "0.0": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], "0.65": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], @@ -565,37 +366,6 @@ "2.1": [10.5, 0, 0] } }, - "foot_left": { - "rotation": { - "0.0": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.15": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.25": ["32+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.45": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.7": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.8": ["24.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.9": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "1.1": ["24.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], - "1.5": [44.4208, -1.70779, 0.30237], - "1.75": [44.4208, -1.70779, 0.30237], - "1.8": [11.9208, -1.70779, 0.30237], - "1.9": [31.9208, -1.70779, 0.30237], - "1.95": [26.9208, -1.70779, 0.30237], - "2.0": [29.4208, -1.70779, 0.30237] - } - }, - "toe_left": { - "rotation": { - "0.0": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.7": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.85": ["28-math.sin(q.anim_time*90*4+90)*6", 0, 0], - "0.95": [-14.94, 0, 0], - "1.45": [14.7, 0, 0], - "1.8": ["43-math.sin(q.anim_time*90*4+90)*6", 0, 0], - "1.85": [-7.91, 0, 0], - "1.95": [33.8, 0, 0], - "2.0": [20.5, 0, 0] - } - }, "tail": { "rotation": { "0.0": [-15, "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0], @@ -681,42 +451,6 @@ "1.8": [0, 0, 0] } }, - "finger_right1": { - "rotation": { - "0.0": ["45-math.sin(q.anim_time*90*4+90)*15", 0, 0], - "1.85": [45, 0, 0] - } - }, - "finger_right2": { - "rotation": { - "0.0": ["35-math.sin(q.anim_time*90*4+90)*20", 0, 0], - "1.85": [35, 0, 0] - } - }, - "finger_right3": { - "rotation": { - "0.0": ["45-math.sin(q.anim_time*90*4+90)*25", 0, 0], - "1.85": [45, 0, 0] - } - }, - "finger_left1": { - "rotation": { - "0.0": ["45-math.sin(q.anim_time*90*4+90)*25", 0, 0], - "1.85": [45, 0, 0] - } - }, - "finger_left2": { - "rotation": { - "0.0": ["35-math.sin(q.anim_time*90*4+90)*20", 0, 0], - "1.85": [35, 0, 0] - } - }, - "finger_left3": { - "rotation": { - "0.0": ["45-math.sin(q.anim_time*90*4+90)*15", 0, 0], - "1.85": [45, 0, 0] - } - }, "whiskers_right": { "rotation": { "0.0": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], @@ -737,7 +471,7 @@ "2.0": [0, 0, 0] } }, - "whiskers_left": { + "whiskers_bottom_left": { "rotation": { "0.0": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], "0.1": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], @@ -747,14 +481,145 @@ "2.0": [0, 0, 0] } }, - "whiskers_bottom_left": { + "eyelid_right": { + "position": { + "0.15": [0, 0, 0], + "0.2": [-0.1, 0, 0], + "0.7": [-0.1, 0, 0], + "0.75": [0, 0, 0], + "1.25": [0, 0, 0], + "1.3": [-0.1, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.15": [0, 0, 0], + "0.2": [0.1, 0, 0], + "0.7": [0.1, 0, 0], + "0.75": [0, 0, 0], + "1.25": [0, 0, 0], + "1.3": [0.1, 0, 0] + } + }, + "arm_right": { "rotation": { - "0.0": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], - "0.1": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], - "0.25": [0, "65-math.sin(q.anim_time*90*8*2+90)*4", 0], - "0.3": [0, "-17.5-math.sin(q.anim_time*90*8*2+90)*4", 0], - "0.35": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], - "2.0": [0, 0, 0] + "0.0": [0, 0, 0], + "1.45": { + "pre": [0, -85, 0], + "post": [0, -85, 0], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [0, 5, 0], + "lerp_mode": "catmullrom" + }, + "1.85": { + "post": [0, -5, 0], + "lerp_mode": "catmullrom" + }, + "2.25": [0, 5, 0] + } + }, + "arm_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.45": { + "pre": [0, 85, 0], + "post": [0, 85, 0], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [0, -5, 0], + "lerp_mode": "catmullrom" + }, + "1.85": { + "post": [0, 5, 0], + "lerp_mode": "catmullrom" + }, + "2.25": [0, -5, 0] + } + }, + "hand_left": { + "rotation": { + "0.0": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.15": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+45", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.3": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.45": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.55": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.65": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+17.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.85": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-47.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.25": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+11.7932", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.45": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-26.481", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.7": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-26.481", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.85": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+36.019", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.9": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-1.481", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "2.0": [43.519, 6.79887, 13.1293] + } + }, + "foot_left": { + "rotation": { + "0.0": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.15": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.25": ["32+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.45": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.7": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.8": ["24.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.9": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.1": ["24.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.5": [44.4208, -1.70779, 0.30237], + "1.75": [44.4208, -1.70779, 0.30237], + "1.8": [11.9208, -1.70779, 0.30237], + "1.9": [31.9208, -1.70779, 0.30237], + "1.95": [26.9208, -1.70779, 0.30237], + "2.0": [29.4208, -1.70779, 0.30237] } } } @@ -767,7 +632,7 @@ "position": [0, -1.25, 0] }, "head": { - "rotation": [-29.67431, -13.31514, 1.90383] + "rotation": [-64.65, -13, 2] }, "ear_right": { "rotation": [0, -12.5, 0] @@ -778,47 +643,38 @@ "hand_right": { "rotation": [-71.06356, 3.95963, -41.43771] }, - "hand_left": { - "rotation": [-66.93521, -4.71064, 22.55925] - }, "foot_right": { "rotation": [65.97754, 60.10526, 58.12806], "position": [0.5, -0.5, -1] }, - "toe_right": { - "rotation": [-7.5, 0, 0] - }, - "foot_left": { - "rotation": [64.12815, -53.9399, -52.92357], - "position": [-0.5, -0.75, -0.75] - }, - "toe_left": { + "toes_right": { "rotation": [-7.5, 0, 0] }, "tail": { - "rotation": [-84.96258, 4.92385, 0.87038], - "position": [0, 0, 0.5] + "rotation": [-92.46258, 4.92385, 0.87038], + "position": [0, -1.3, -0.2] }, "tail2": { - "rotation": [-12.92638, -14.63639, 3.31914] + "rotation": [-20.42638, -14.63639, 3.31914] }, "tail3": { - "rotation": [-22.5, -25, 0] + "rotation": [-20, -72.5, 0] }, "tail4": { - "rotation": [5, -52.5, 0] + "rotation": [-5, -27.5, 0] }, "eyelid_right": { - "position": [-0.1, 0, -0.1] + "position": [-0.1, 0, 0] }, "eyelid_left": { - "position": [0.1, 0, -0.1] + "position": [0.1, 0, 0] }, "whiskers_right": { "rotation": [0, 7.5, 0] }, - "whiskers_left": { - "rotation": [0, -7.5, 0] + "foot_left": { + "rotation": [35, -72.5, 0], + "position": [-0.7, 0, -1.1] } } }, @@ -828,14 +684,14 @@ "eyelid_right": { "position": { "0.0": [-0.1, 0, 0], - "0.125": [-0.1, 0, -0.1], + "0.125": [-0.1, 0, 0], "0.1667": [0, 0, 0] } }, "eyelid_left": { "position": { "0.0": [0.1, 0, 0], - "0.125": [0.1, 0, -0.1], + "0.125": [0.1, 0, 0], "0.1667": [0, 0, 0] } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate_alolan.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate_alolan.animation.json index 4ae496635f..84681d47d5 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate_alolan.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0020_raticate/raticate_alolan.animation.json @@ -595,6 +595,731 @@ "effect": "pokemon.raticate_alolan.alola.cry" } } + }, + "animation.raticate.ground_idle": { + "loop": true, + "bones": { + "body": { + "rotation": [5, 0, 0], + "position": [0, "0.775-math.sin(q.anim_time*90*4-90)*0.275", "math.sin(q.anim_time*90*4-90)*0.2"] + }, + "head": { + "rotation": ["-5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0] + }, + "ear_right": { + "rotation": [0, "math.sin(q.anim_time*90*8*2)*2", 0] + }, + "ear_left": { + "rotation": [0, "-math.sin(q.anim_time*90*8*2)*2", 0] + }, + "hand_right": { + "rotation": [ + "math.clamp(math.sin(q.anim_time*90*4)*1,-10,10)+1.0572", + -85.46869, + "-8.9431-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ] + }, + "foot_right": { + "rotation": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "position": ["-(math.sin(q.anim_time*90*4+90)*0.05)", 0, "math.sin(q.anim_time*90*4+90)*0.02"] + }, + "toes_right": { + "rotation": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0] + }, + "tail": { + "rotation": [-15, "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0] + }, + "tail2": { + "rotation": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0] + }, + "tail3": { + "rotation": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0] + }, + "tail4": { + "rotation": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0] + }, + "whiskers_right": { + "rotation": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0] + }, + "arm_right": { + "rotation": [5, -55, -55] + }, + "finger_back_right": { + "rotation": [0, 0, "-45+math.sin(q.anim_time*90*4+90)*15"] + }, + "finger_front_right": { + "rotation": [0, 0, "-45+math.sin(q.anim_time*90*4+90)*25"] + }, + "finger_middle_right": { + "rotation": [0, 0, "-35+math.sin(q.anim_time*90*4+90)*20"] + }, + "foot_left": { + "rotation": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "position": ["math.sin(q.anim_time*90*4+90)*0.05", 0, "math.sin(q.anim_time*90*4+90)*0.02"] + }, + "toes_left": { + "rotation": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0] + }, + "arm_left": { + "rotation": [5, 55, 55] + }, + "hand_left": { + "rotation": [ + "math.clamp(math.sin(q.anim_time*90*4)*-1,-10,10)+1.0572", + 85.46869, + "8.9431-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "position": [0, 0, -0.2] + }, + "finger_back_left": { + "rotation": [0, 0, "45-math.sin(q.anim_time*90*4+90)*15"] + }, + "finger_middle_left": { + "rotation": [0, 0, "35-math.sin(q.anim_time*90*4+90)*20"] + }, + "finger_front_left": { + "rotation": [0, 0, "45-math.sin(q.anim_time*90*4+90)*25"] + }, + "whiskers_lower_right": { + "rotation": [0, "-math.sin(q.anim_time*90*8*2+90)*2", 0] + }, + "whiskers_lower_left": { + "rotation": [0, "math.sin(q.anim_time*90*8*2+90)*2", 0] + }, + "torso": { + "rotation": [-2.5, 0, 0] + } + } + }, + "animation.raticate.ground_walk": { + "loop": true, + "bones": { + "body": { + "rotation": [ + "math.clamp(math.sin(query.anim_time*180*4/2+20)*1,0.2,2)+math.clamp(-math.sin(query.anim_time*180*4/2+20)*1,0.2,2)+10", + "math.sin(query.anim_time*90*4+20)*10", + "math.sin(query.anim_time*90*4+20)*2" + ], + "position": [ + 0, + "-math.clamp(math.sin(-query.anim_time*90*4+45/2)*1,0.1,1)-math.clamp(math.sin(-query.anim_time*90*4+45/2+180)*1,0.1,1)+2", + "-math.clamp(math.sin(query.anim_time*90*4)*0.7,0.1,0.6)-math.clamp(math.sin(-query.anim_time*90*4)*0.7,0.1,0.6)+0.2" + ] + }, + "head": { + "rotation": [ + "-math.clamp(math.sin(query.anim_time*180*4/2+20)*1,0.2,2)-math.clamp(-math.sin(query.anim_time*180*4/2+20)*1,0.2,2)-1", + "-math.sin(query.anim_time*90*4-10)*5", + "-math.sin(query.anim_time*90*4+20)*2" + ] + }, + "ear_right": { + "rotation": [0, "-3*(math.sin(query.anim_time*90*8)*1-2)+math.sin(q.anim_time*90*8*2)*2", 0] + }, + "ear_left": { + "rotation": [0, "3*(math.sin(query.anim_time*90*8)*1-2)-math.sin(q.anim_time*90*8*2)*2", 0] + }, + "hand_right": { + "rotation": [-222.41874, "-62.9152+math.sin(query.anim_time*90*4+20)*10", "228.4598-(math.sin(query.anim_time*90*4+20)*1+2)*4"] + }, + "foot_right": { + "rotation": [ + "-math.clamp(math.sin(query.anim_time*90*4+45+180)*10,-15,14)+math.clamp(-math.sin(query.anim_time*90*4+180*2)*12,5,12)-5", + "-math.clamp(-math.sin(query.anim_time*90*4)*7.5,0,10)+math.clamp(-math.sin(query.anim_time*90*4+90)*2,0,10)+math.clamp(math.sin(query.anim_time*90*4+180)*25,0,30)", + 0 + ], + "position": [ + 0.3, + "-math.clamp(-math.sin(query.anim_time*90*4+20+180)*0.4,0.5,2)+math.clamp(-math.sin(query.anim_time*90*4-30)*1,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4+180)*2,1,2)+math.clamp(-math.sin(query.anim_time*90*4+100)*1.4,1,1.4)-2.8", + "-math.clamp(math.sin(query.anim_time*90*4+180)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4+180)*0.4,-0.8,0)-0.1" + ] + }, + "toes_right": { + "rotation": ["-11-math.clamp(math.sin(query.anim_time*90*4+50)*1,0,20)-math.clamp(math.sin(query.anim_time*90*4+90)*5,0,20)", 0, 0] + }, + "tail": { + "rotation": ["-25+math.sin(query.anim_time*90*8-160)*2", "math.sin(query.anim_time*90*4-20)*10", 0] + }, + "tail2": { + "rotation": [5, "math.sin(query.anim_time*90*4-120)*5", 0] + }, + "tail3": { + "rotation": [5, "math.sin(query.anim_time*90*4-150)*5", 0] + }, + "tail4": { + "rotation": [5, "math.sin(query.anim_time*90*4-190)*5", 0] + }, + "whiskers_right": { + "rotation": [0, "-3*(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*3", 0] + }, + "whiskers_bottom_right": { + "rotation": [0, "(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*2", 0] + }, + "whiskers_bottom_left": { + "rotation": [0, "-(math.sin(query.anim_time*90*8+90)*1-5)-math.sin(q.anim_time*90*8*2+90)*2", 0] + }, + "whiskers_left": { + "rotation": [0, "3*(math.sin(query.anim_time*90*8+90)*1-5)+math.sin(q.anim_time*90*8*2+90)*3", 0] + }, + "arm_right": { + "rotation": [0, "-62.5-math.sin(query.anim_time*90*4-50)*10", 0] + }, + "finger_back_right": { + "rotation": [0, 0, -60] + }, + "finger_middle_right": { + "rotation": [0, 0, -45] + }, + "finger_front_right": { + "rotation": [0, 0, -35] + }, + "arm_left": { + "rotation": [0, "62.5-math.sin(query.anim_time*90*4-50)*10", 0] + }, + "hand_left": { + "rotation": [-222.41874, "62.9152+math.sin(query.anim_time*90*4+20)*10", "-228.4598-(math.sin(query.anim_time*90*4+20)*1+2)*4"] + }, + "finger_back_left": { + "rotation": [0, 0, 60] + }, + "finger_middle_left": { + "rotation": [0, 0, 45] + }, + "finger_front_left": { + "rotation": [0, 0, 35] + }, + "foot_left": { + "rotation": [ + "-math.clamp(math.sin(query.anim_time*90*4+45)*10,-15,14)+math.clamp(-math.sin(query.anim_time*90*4+180*1)*12,5,12)-5", + "math.clamp(-math.sin(query.anim_time*90*4+180)*7.5,0,10)-math.clamp(-math.sin(query.anim_time*90*4+90+180)*2,0,10)-math.clamp(math.sin(query.anim_time*90*4+180*2)*25,0,30)", + 0 + ], + "position": [ + -0.3, + "-math.clamp(-math.sin(query.anim_time*90*4+20)*0.4,0.5,2)+math.clamp(-math.sin(query.anim_time*90*4-30+190)*1,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4)*2,1,2)+math.clamp(-math.sin(query.anim_time*90*4-80)*1.4,1,1.4)-2.8", + "-math.clamp(math.sin(query.anim_time*90*4)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4)*0.4,-0.8,0)-0.1" + ] + }, + "toes_left": { + "rotation": ["-11-math.clamp(math.sin(query.anim_time*90*4+50+180)*1,0,20)-math.clamp(math.sin(query.anim_time*90*4+90+180)*5,0,20)", 0, 0] + }, + "torso": { + "rotation": [0, "-math.sin(query.anim_time*90*4+20)*6", 0] + } + } + }, + "animation.raticate.faint": { + "loop": true, + "animation_length": 3, + "bones": { + "body": { + "rotation": { + "0.0": [5, 0, 0], + "0.1": [-20, 0, 0], + "0.25": [-105, 0, 0], + "0.4": [-115, 0, 0], + "0.5": [-107.5, 0, 0], + "0.7": [-77.5, 2.5, 0], + "0.95": [-70, 5, 0], + "1.65": [-70, 5, 0], + "1.8": [-97.58957, 4.43385, -2.31336], + "1.9": [-85.0547, 4.82922, -1.29717], + "2.0": [-90.0703, 4.69776, -1.71394] + }, + "position": { + "0.0": [0, "0.775-math.sin(q.anim_time*90*4-90)*0.275", "-math.sin(q.anim_time*90*4-90)*0.2"], + "0.1": [0, "-0.525-math.sin(q.anim_time*90*4-90)*0.275", "1.8-math.sin(q.anim_time*90*4-90)*0.2"], + "0.25": [0, "-1.525-math.sin(q.anim_time*90*4-90)*0.275", "6.8-math.sin(q.anim_time*90*4-90)*0.2"], + "0.4": [0, "-1.125-math.sin(q.anim_time*90*4-90)*0.275", "7.4-math.sin(q.anim_time*90*4-90)*0.2"], + "0.5": [0, "-1.125-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.6": [0, "-2.025-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.7": [0, "-1.225-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.75": [0, "-1.525-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.8": [0, "-1.025-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.85": [0, "-1.325-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.9": [0, "-1.125-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "0.95": [0, "-1.325-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.0": [0, "-1.625-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.05": [0, "-1.525-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.1": [0, "-1.125-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.15": [0, "-1.325-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.2": [0, "-1.625-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.25": [0, "-1.525-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.65": [0, "-1.525-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.8": [0, "-3.125-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "1.9": [0, "-2.525-math.sin(q.anim_time*90*4-90)*0.275", "7.1-math.sin(q.anim_time*90*4-90)*0.2"], + "2.0": [0, -3.125, 7.1] + } + }, + "head": { + "rotation": { + "0.0": ["12.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], + "0.05": ["-27.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], + "0.35": ["22.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], + "0.4": ["25-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], + "0.5": ["7.5-0.5*math.sin(q.anim_time*90*8*2)", 0, 0], + "0.7": ["-54.816-0.5*math.sin(q.anim_time*90*8*2)", -2.15393, -9.76758], + "0.95": ["-69.5623-0.5*math.sin(q.anim_time*90*8*2)", -4.2453, -11.76782], + "1.65": ["-68.52-0.5*math.sin(q.anim_time*90*8*2)", -20.65943, -5.99103], + "1.8": ["14.9766-0.5*math.sin(q.anim_time*90*8*2)", 5.09214, -7.86626], + "1.9": ["-14.7293-0.5*math.sin(q.anim_time*90*8*2)", 0.13616, -10.50964], + "2.0": [-2.0823, -1.15346, -9.75926] + } + }, + "ear_right": { + "rotation": { + "0.0": [0, "math.sin(q.anim_time*90*8*2)*2", 0], + "0.05": [0, "-72.5+math.sin(q.anim_time*90*8*2)*2", 0], + "0.25": [0, "-72.5+math.sin(q.anim_time*90*8*2)*2", 0], + "0.3": [0, "-20+math.sin(q.anim_time*90*8*2)*2", 0], + "0.35": [0, "-30+math.sin(q.anim_time*90*8*2)*2", 0], + "0.4": [0, "-20+math.sin(q.anim_time*90*8*2)*2", 0], + "0.5": [0, "-20+math.sin(q.anim_time*90*8*2)*2", 0], + "0.55": [7.20885, "-27.2198+math.sin(q.anim_time*90*8*2)*2", -2.04756], + "0.6": [17.15211, "-29.4438+math.sin(q.anim_time*90*8*2)*2", -3.19088], + "0.85": [37.56502, "-24.3593+math.sin(q.anim_time*90*8*2)*2", 2.33976], + "1.0": [37.56502, "-24.3593+math.sin(q.anim_time*90*8*2)*2", 2.33976], + "1.05": [66.01014, "-43.0294+math.sin(q.anim_time*90*8*2)*2", -39.97343], + "1.2": [51.94295, "-39.5884+math.sin(q.anim_time*90*8*2)*2", -33.12681], + "1.3": [37.9366, "-50.0423+math.sin(q.anim_time*90*8*2)*2", -10.98731], + "1.4": [26.33209, "-50.2097+math.sin(q.anim_time*90*8*2)*2", 32.31168], + "1.6": [35.81462, "-36.8014+math.sin(q.anim_time*90*8*2)*2", 10.88441], + "1.8": [-1.83422, -34.6693, 4.06103], + "1.95": [-1.65754, -17.3478, 6.56992] + } + }, + "ear_left": { + "rotation": { + "0.0": [0, "-math.sin(q.anim_time*90*8*2)*2", 0], + "0.05": [0, "72.5-math.sin(q.anim_time*90*8*2)*2", 0], + "0.25": [0, "72.5-math.sin(q.anim_time*90*8*2)*2", 0], + "0.3": [0, "17.5-math.sin(q.anim_time*90*8*2)*2", 0], + "0.35": [0, "30-math.sin(q.anim_time*90*8*2)*2", 0], + "0.4": [0, "17.5-math.sin(q.anim_time*90*8*2)*2", 0], + "0.5": [-0.20842, "19.9535-math.sin(q.anim_time*90*8*2)*2", 0.47494], + "0.55": [6.94923, "29.4437-math.sin(q.anim_time*90*8*2)*2", 3.73516], + "0.6": [16.96889, "33.9009-math.sin(q.anim_time*90*8*2)*2", 6.00144], + "0.8": [16.96889, "33.9009-math.sin(q.anim_time*90*8*2)*2", 6.00144], + "0.85": [22.58354, 49.60028, 23.40827], + "0.9": [68.19818, "67.6508-math.sin(q.anim_time*90*8*2)*2", 40.81509], + "1.05": [38.21726, "20.3374-math.sin(q.anim_time*90*8*2)*2", -8.78351], + "1.35": [34.55374, "36.1587-math.sin(q.anim_time*90*8*2)*2", 10.39668], + "1.55": [34.26926, 40.86408, 17.7648], + "1.65": [34.19912, "41.2488-math.sin(q.anim_time*90*8*2)*2", 15.71502], + "1.8": [-2.22434, 12.23678, -0.63251], + "2.0": [-2.72488, 14.72562, 0.43689] + } + }, + "hand_right": { + "rotation": { + "0.0": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.15": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+30", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.3": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-45", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.45": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-45", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.55": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+25", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.65": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-25", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.85": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+32.5", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.0": [ + 20.84292, + 6.67898, + "-13.6908-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.25": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-25", + 5, + "-15-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.45": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-64.4567", + -1.69506, + "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.7": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-64.4567", + -1.69506, + "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.85": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+40.5433", + -1.69506, + "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.9": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+0.5433", + -1.69506, + "-17.4303-math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)-math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "2.0": [50.5433, -1.69506, -17.4303] + }, + "position": { + "0.0": [0, 0, 0], + "0.45": [0, 0.6, 0], + "1.0": [0, 0.6, 0], + "1.25": [0, 1.6, 0], + "1.7": [0, 1.6, 0], + "1.8": [0, -0.4, 0] + } + }, + "foot_right": { + "rotation": { + "0.0": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.15": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.25": ["29.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.45": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.7": ["29.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.8": ["7+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.9": ["29.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.1": ["7+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.3": ["-17.9264+math.sin(q.anim_time*90*4+90)*6", 1.82403, -1.16045], + "1.45": ["2.0184+math.sin(q.anim_time*90*4+90)*6", 0.40251, -0.16665], + "1.6": ["11.9806+math.sin(q.anim_time*90*4+90)*6", -0.41546, 0.13107], + "1.85": [19.4504, -1.05603, 0.2589], + "1.9": [31.9504, -1.05603, 0.2589], + "1.95": [19.4504, -1.05603, 0.2589], + "2.0": [29.4208, -1.05603, 0.2589] + }, + "position": { + "1.1": [0, 0, 0], + "1.45": [0, -1, -2], + "1.55": [0, -1, -1.3], + "1.85": [0, -0.5, -0.3], + "1.9": [0, -0.2, 0] + } + }, + "toes_right": { + "rotation": { + "0.0": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.65": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.75": ["25.5-math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.85": [-19.57, 0, 0], + "1.0": [19.89, 0, 0], + "1.35": [-24.71, 0, 0], + "1.8": ["-17-math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.9": [35.5, 0, 0], + "2.0": [-9.5, 0, 0], + "2.1": [10.5, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": [-15, "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0], + "0.1": [12.5, "0+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0], + "0.2": [85.23689, "-0.7785+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 36.42522], + "0.25": [105.88527, "-11.6425+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 39.02959], + "0.45": [105.88527, "-11.6425+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 39.02959], + "0.55": [103.96232, "-13.4273+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 54.17309], + "0.65": [104.52751, "11.3144+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 72.67923], + "0.75": [104.59986, "18.5921+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 74.54384], + "0.9": [82.24038, "6.2431+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 5.61481], + "1.05": [84.6256, "-16.3684+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -40.19369], + "1.15": [88.44726, "-17.4346+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -58.07144], + "1.8": [119.93885, -30.64655, -78.08225], + "1.85": [122.43885, -30.64655, -78.08225], + "1.9": [119.93885, -30.64655, -78.08225], + "2.15": [119.93557, -30.34631, -88.07608] + }, + "position": { + "0.0": [0, 0, 0], + "1.8": [0, 0, 0], + "1.9": [0, 0, -0.5] + } + }, + "tail2": { + "rotation": { + "0.0": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0], + "0.15": ["10.4141+4*(math.sin(q.anim_time*90*8)*1)", "-24.2787+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -6.0213], + "0.2": ["11.8057+4*(math.sin(q.anim_time*90*8)*1)", "-38.8722+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -9.76714], + "0.3": ["10.7026+4*(math.sin(q.anim_time*90*8)*1)", "-14.163+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -5.77968], + "0.4": ["10.8862+4*(math.sin(q.anim_time*90*8)*1)", "5.6914+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -3.35112], + "0.5": ["11.5791+4*(math.sin(q.anim_time*90*8)*1)", "17.954+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -0.82512], + "0.75": ["11.5791+4*(math.sin(q.anim_time*90*8)*1)", "17.954+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -0.82512], + "0.85": ["15.9314+4*(math.sin(q.anim_time*90*8)*1)", "54.8676+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 7.21962], + "1.25": ["10.4686+4*(math.sin(q.anim_time*90*8)*1)", "-46.1941+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -13.58604], + "1.75": ["10.4686+4*(math.sin(q.anim_time*90*8)*1)", "-46.1941+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -13.58604], + "1.85": [-36.21756, -33.9563, -0.83891], + "1.9": [-28.71756, -33.9563, -0.83891], + "1.95": [-24.96756, -33.9563, -0.83891], + "2.0": [-36.21756, -33.9563, -0.83891], + "2.35": [-39.38479, -37.73091, 3.05903] + }, + "position": { + "0.0": [0, 0, 0], + "1.8": [0, 0, 0], + "2.0": [0, 0, -1] + } + }, + "tail3": { + "rotation": { + "0.0": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0], + "0.65": ["10.7864+4*(math.sin(q.anim_time*90*8)*1)", "21.83+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 5.53919], + "0.75": ["10.7864+4*(math.sin(q.anim_time*90*8)*1)", "21.83+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 5.53919], + "0.85": ["13.5863+4*(math.sin(q.anim_time*90*8)*1)", "51.5322+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 10.64036], + "0.9": [16.26436, 60.37208, 17.0469], + "1.3": ["17.1618+4*(math.sin(q.anim_time*90*8)*1)", "-35.2484+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -2.46783], + "1.85": ["37.1618+4*(math.sin(q.anim_time*90*8)*1)", "-35.2484+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -2.46783], + "1.9": [-2.8382, -35.2484, -2.46783], + "1.95": [4.6618, -35.2484, -2.46783], + "2.0": [-5.3382, -35.2484, -2.46783], + "2.5": [-8.65848, -50.04076, 0.38541] + }, + "position": { + "0.0": [0, 0, 0], + "1.8": [0, 0, 0], + "2.0": [0.25, 0, -0.5] + } + }, + "tail4": { + "rotation": { + "0.0": ["10+4*(math.sin(q.anim_time*90*8)*1)", "8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 0], + "0.25": [10.49236, -22.84012, -5.95432], + "0.75": ["11.1724+4*(math.sin(q.anim_time*90*8)*1)", "31.9768+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", 6.00028], + "1.35": ["12.8311+4*(math.sin(q.anim_time*90*8)*1)", "-25.1693+8*(math.sin(q.anim_time*90*4)*1)+4*(math.sin(q.anim_time*90*4/2)*1)", -0.7112], + "1.9": [30.25667, -30.59156, -0.7112], + "1.95": [-7.1689, -25.1693, -0.7112], + "2.0": [7.8311, -25.1693, -0.7112], + "2.05": [-2.1689, -25.1693, -0.7112], + "2.65": [-3.78278, -40.10402, 0.52884] + }, + "position": { + "0.0": [0, 0, 0], + "1.8": [0, 0, 0] + } + }, + "whiskers_right": { + "rotation": { + "0.0": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.1": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.25": [0, "-55+math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.3": [0, "17.5+math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.35": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], + "2.0": [0, 0, 0] + } + }, + "whiskers_bottom_right": { + "rotation": { + "0.0": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.1": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.25": [0, "-55+math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.3": [0, "17.5+math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.35": [0, "math.sin(q.anim_time*90*8*2+90)*4", 0], + "2.0": [0, 0, 0] + } + }, + "whiskers_bottom_left": { + "rotation": { + "0.0": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.1": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.25": [0, "65-math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.3": [0, "-17.5-math.sin(q.anim_time*90*8*2+90)*4", 0], + "0.35": [0, "-math.sin(q.anim_time*90*8*2+90)*4", 0], + "2.0": [0, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.15": [-0.1, 0, 0], + "0.2": [-0.1, 0, -0.1], + "0.7": [-0.1, 0, -0.1], + "0.75": [-0.1, 0, 0], + "1.25": [-0.1, 0, 0], + "1.3": [-0.1, 0, -0.1] + } + }, + "eyelid_left": { + "position": { + "0.15": [0.1, 0, 0], + "0.2": [0.1, 0, -0.1], + "0.7": [0.1, 0, -0.1], + "0.75": [0.1, 0, 0], + "1.25": [0.1, 0, 0], + "1.3": [0.1, 0, -0.1] + } + }, + "hand_left": { + "rotation": { + "0.0": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-15", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.15": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+45", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.3": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.45": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.55": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-37.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.65": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+17.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "0.85": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-47.5", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.25": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+11.7932", + -5, + "15+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.45": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-26.481", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.7": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-26.481", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.85": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)+36.019", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "1.9": [ + "-math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)-1.481", + 6.79887, + "13.1293+math.clamp(math.sin(q.anim_time*90*8)*1,-0.5,0)+math.clamp(math.sin(q.anim_time*90*8)*1,0,0.5)+math.clamp(math.sin(q.anim_time*90*8)*3,-10,10)" + ], + "2.0": [43.519, 6.79887, 13.1293] + } + }, + "foot_left": { + "rotation": { + "0.0": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.15": ["12+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.25": ["32+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.45": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.7": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.8": ["24.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "0.9": ["4.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.1": ["24.5+math.sin(q.anim_time*90*4+90)*6", 0, 0], + "1.5": [44.4208, -1.70779, 0.30237], + "1.75": [44.4208, -1.70779, 0.30237], + "1.8": [11.9208, -1.70779, 0.30237], + "1.9": [31.9208, -1.70779, 0.30237], + "1.95": [26.9208, -1.70779, 0.30237], + "2.0": [29.4208, -1.70779, 0.30237] + } + } + } + }, + "animation.raticate.sleep": { + "loop": true, + "bones": { + "body": { + "rotation": [75, 0, 0], + "position": [0, -1.25, 0] + }, + "head": { + "rotation": [-64.65, -13, 2] + }, + "ear_right": { + "rotation": [0, -12.5, 0] + }, + "ear_left": { + "rotation": [0, 7.5, 0] + }, + "hand_right": { + "rotation": [-71.06356, 3.95963, -41.43771] + }, + "foot_right": { + "rotation": [65.97754, 60.10526, 58.12806], + "position": [0.5, -0.5, -1] + }, + "toes_right": { + "rotation": [-7.5, 0, 0] + }, + "tail": { + "rotation": [-92.46258, 4.92385, 0.87038], + "position": [0, -5, -1.7] + }, + "tail2": { + "rotation": [-20.42638, -14.63639, 3.31914] + }, + "tail3": { + "rotation": [-20, -72.5, 0] + }, + "tail4": { + "rotation": [-5, -27.5, 0] + }, + "whiskers_right": { + "rotation": [0, 7.5, 0] + }, + "foot_left": { + "rotation": [35, -72.5, 0], + "position": [-0.7, 0, -1.1] + }, + "eyelid_right": { + "position": [-0.1, 0, -0.1] + }, + "eyelid_left": { + "position": [0.1, 0, -0.1] + } + } + }, + "animation.raticate.blink": { + "animation_length": 0.16667, + "bones": { + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, -0.1], + "0.125": [-0.1, 0, -0.1], + "0.1667": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0": [0.1, 0, -0.1], + "0.125": [0.1, 0, -0.1], + "0.1667": [0, 0, 0] + } + } + } } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor.animation.json index c950fb3a85..424795f4ef 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor.animation.json @@ -1,6 +1,101 @@ { "format_version": "1.8.0", "animations": { + "animation.exeggutor.cry": { + "animation_length": 1.5, + "bones": { + "mouth": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, -2, 0], + "1.25": [0, -2, 0], + "1.5": [0, 0, 0] + } + }, + "mouth2": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, -5, 0], + "1.25": [0, -5, 0], + "1.5": [0, 0, 0] + } + }, + "jaw": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, -3, 0], + "1.25": [0, -3, 0], + "1.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-15, 0, 0], + "1.25": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "mouth_closed": { + "position": { + "0.0": [0, 0, -0.1], + "0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]} + } + }, + "mouth_open": { + "position": { + "0.0": [0, 0, 0.1], + "0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]} + } + }, + "head2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-15, 0, 0], + "1.25": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "mouth_closed2": { + "position": { + "0.0": [0, 0, 0], + "0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.2]}, + "1.25": {"pre": [0, 0, 0.2], "post": [0, 0, 0]} + } + }, + "mouth_open2": { + "position": { + "0.0": [0, 0, 0], + "0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}, + "1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]} + } + }, + "head3": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-15, 0, 0], + "1.25": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "mouth_closed3": { + "position": { + "0.0": [0, 0, -0.1], + "0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]} + } + }, + "mouth_open3": { + "position": { + "0.0": [0, 0, 0.1], + "0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]} + } + } + } + }, "animation.exeggutor.ground_idle": { "loop": true, "bones": { @@ -83,7 +178,8 @@ "rotation": ["-12.5+math.sin(q.anim_time*90*1-180)*8", 0, 0] }, "leaf31": { - "rotation": ["20+math.sin(q.anim_time*90*1-60)*3", 0, 0] + "rotation": ["20+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 1, 0] }, "leaf32": { "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] @@ -119,7 +215,8 @@ "rotation": ["0+math.sin(q.anim_time*90*1-180)*8", 0, 0] }, "leaf10": { - "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 1, 0] }, "leaf11": { "rotation": ["-32.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] @@ -128,7 +225,8 @@ "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] }, "leaf13": { - "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 2, 0] }, "leaf14": { "rotation": ["-30+math.sin(q.anim_time*90*1-120)*6", 0, 0] @@ -137,7 +235,8 @@ "rotation": ["-5+math.sin(q.anim_time*90*1-180)*8", 0, 0] }, "leaf16": { - "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 1, 0] }, "leaf17": { "rotation": ["-32.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] @@ -247,7 +346,8 @@ "rotation": ["-12.5+math.sin(q.anim_time*90*5-80)*8", 0, 0] }, "leaf31": { - "rotation": ["20-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0] + "rotation": ["20-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0], + "position": [0, 1, 0] }, "leaf32": { "rotation": ["-20+math.sin(q.anim_time*90*5-40)*8", 0, 0] @@ -283,7 +383,8 @@ "rotation": ["0+math.sin(q.anim_time*90*5-80)*8", 0, 0] }, "leaf10": { - "rotation": ["27.5-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0] + "rotation": ["27.5-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0], + "position": [0, 1, 0] }, "leaf11": { "rotation": ["-32.5+math.sin(q.anim_time*90*5-40)*8", 0, 0] @@ -292,7 +393,8 @@ "rotation": ["-10+math.sin(q.anim_time*90*5-80)*8", 0, 0] }, "leaf13": { - "rotation": ["27.5-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0] + "rotation": ["27.5-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0], + "position": [0, 2, 0] }, "leaf14": { "rotation": ["-30+math.sin(q.anim_time*90*5-40)*8", 0, 0] @@ -301,7 +403,8 @@ "rotation": ["-5+math.sin(q.anim_time*90*5-80)*8", 0, 0] }, "leaf16": { - "rotation": ["27.5-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0] + "rotation": ["27.5-math.abs(math.sin(q.anim_time*90*2.5-20)*8)", 0, 0], + "position": [0, 1, 0] }, "leaf17": { "rotation": ["-32.5+math.sin(q.anim_time*90*5-40)*8", 0, 0] @@ -440,7 +543,8 @@ "position": [-0.5, 0, 0] }, "leaf28": { - "rotation": ["-2.5-math.sin(q.anim_time*90*5-90)*8", 0, 0] + "rotation": ["-2.5-math.sin(q.anim_time*90*5-90)*8", 0, 0], + "position": [0, 1, 0] }, "leaf29": { "rotation": ["-17.5+math.sin(q.anim_time*90*5)*12", 0, 0] @@ -482,7 +586,8 @@ "rotation": ["-10+math.sin(q.anim_time*90*5-20)*25", 0, 0] }, "leaf31": { - "rotation": ["20-math.sin(q.anim_time*90*5-90)*8", 0, 0] + "rotation": ["20-math.sin(q.anim_time*90*5-90)*8", 0, 0], + "position": [0, 1, 0] }, "leaf32": { "rotation": ["-20+math.sin(q.anim_time*90*5)*12", 0, 0] @@ -491,7 +596,8 @@ "rotation": ["-10+math.sin(q.anim_time*90*5-80)*8", 0, 0] }, "leaf34": { - "rotation": ["10-math.sin(q.anim_time*90*5-90)*8", 7.5, -2.5] + "rotation": ["10-math.sin(q.anim_time*90*5-90)*8", 7.5, -2.5], + "position": [0, 1, 0] }, "leaf35": { "rotation": ["-10+math.sin(q.anim_time*90*5)*12", 0, 0] @@ -518,7 +624,8 @@ "rotation": ["0+math.sin(q.anim_time*90*5-40)*15", 0, 0] }, "leaf10": { - "rotation": ["27.5-math.sin(q.anim_time*90*5-90)*8", 0, 0] + "rotation": ["27.5-math.sin(q.anim_time*90*5-90)*8", 0, 0], + "position": [0, 0, 2] }, "leaf11": { "rotation": ["-32.5+math.sin(q.anim_time*90*5)*12", 0, 0] @@ -527,7 +634,8 @@ "rotation": ["-10+math.sin(q.anim_time*90*5-20)*20", 0, 0] }, "leaf13": { - "rotation": ["27.5-math.sin(q.anim_time*90*5-90)*8", 0, 0] + "rotation": ["27.5-math.sin(q.anim_time*90*5-90)*8", 0, 0], + "position": [0, 2, 1] }, "leaf14": { "rotation": ["-30+math.sin(q.anim_time*90*5)*12", 0, 0] @@ -536,7 +644,8 @@ "rotation": ["-5+math.sin(q.anim_time*90*5-20)*20", 0, 0] }, "leaf16": { - "rotation": ["27.5-math.sin(q.anim_time*90*5-90)*8", 0, 0] + "rotation": ["27.5-math.sin(q.anim_time*90*5-90)*8", 0, 0], + "position": [0, 2, 0] }, "leaf17": { "rotation": ["-32.5+math.sin(q.anim_time*90*5)*12", 0, 0] @@ -558,380 +667,192 @@ } } }, - "animation.exeggutor.sleep": { + "animation.exeggutor.faint": { "loop": true, + "animation_length": 3, "bones": { - "leg_left": { - "rotation": [-90, -30, 0], - "position": [0, 0.5, -4] - }, - "foot_left": { - "rotation": [-5, 0, 0] - }, - "leg_right": { - "rotation": [-90, 30, 0], - "position": [0, 0.5, -4] - }, - "foot_right": { - "rotation": [-5, 0, 0] - }, "body": { - "position": [0, -6.5, 3] + "rotation": { + "0.0": [0, 0, 0], + "1.0417": [-12.5, 0, 0], + "1.1667": [32.5, 0, 0], + "1.2917": [77.5, 0, 0], + "1.4167": [82.5, 0, 0], + "1.5417": [102.5, 0, 0], + "1.5833": [107.5, 0, 0], + "1.6667": [105, 0, 0], + "1.7083": [102.5, 0, 0], + "1.7917": [100, 0, 0], + "1.875": [105, 0, 0], + "1.9167": [102.5, 0, 0], + "2.0": [105, 0, 0] + }, + "position": { + "0.0": [0, -2.5, 0], + "0.125": [0, -1.1, 0], + "1.0417": [0, -1.1, 0], + "1.1667": [0, -0.1, 4], + "1.2917": [0, 10.9, 8], + "1.4167": [0, 12.9, 8], + "1.5417": [0, 7.9, 6], + "1.5833": [0, 10.9, 5], + "1.6667": [0, 10.9, 3], + "1.7083": [0, 9.9, 2.5], + "1.7917": [0, 7.9, 2], + "1.9167": [0, 7.9, 1.5], + "2.0833": [0, 7.9, 0.5], + "2.25": [0, 7.9, 0.25] + } }, "torso": { - "rotation": ["12.5+math.sin(q.anim_time*90*1+45)*1", 0, 0], - "position": [0, 0.5, 0] + "rotation": { + "0.0": [17.5, 0, 0], + "0.125": [-20, 0, 0], + "0.4583": { + "pre": [-7.91907, -21.39099, 8.6801], + "post": [-7.91907, -21.39099, 8.6801], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-17.21055, -5.69391, 15.99181], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": [-12.5, 0, 0], + "1.5417": [-25, 0, 0], + "1.6667": [-30, 0, 0], + "1.7917": [-22.86, 0, 0], + "1.9583": [-25, 0, 0] + }, + "position": { + "0.0": [0, 1, 2], + "0.125": [0, 3, -4], + "1.0417": [0, 3, -4], + "1.4167": [0, 3, -5] + } }, "head": { - "rotation": ["15-math.sin(q.anim_time*90*0.5-60)*2", 0, "math.sin(q.anim_time*90*1)*2"] + "rotation": { + "0.0": [0, 0, 0], + "0.125": [17.5, 0, 0], + "0.3333": [17.5, 0, 0], + "0.4583": [2.5, 0, 0], + "1.0417": [-2.5, 0, 0], + "1.2083": [-10, 0, 0], + "1.3333": [-20, 0, 0], + "1.4583": [-30, 0, 0], + "1.5417": [-72.5, 0, 0], + "1.5833": [-52.5, 0, 0], + "1.7917": [-55, 0, 0], + "1.875": [-82.5, 0, 0], + "2.0": [-80, 0, 0] + }, + "position": [0, 0, 0] }, "head2": { - "rotation": ["15-math.sin(q.anim_time*90*0.5-120)*2", 0, "math.sin(q.anim_time*90*0.5)*2"] + "rotation": { + "0.0": [0, 10, 0], + "0.125": [27.5, 10, 0], + "0.25": [32.21647, -3.67263, -11.51342], + "0.3333": [28.64518, 0.93492, -7.44828], + "1.0417": [3.81324, 5.9337, -7.64947], + "1.2083": [-6.25548, -1.39166, -4.61789], + "1.3333": [-24.63403, 2.34891, 13.75642], + "1.4583": [-39.93378, 7.53065, 23.25433], + "1.5417": [-92.06708, 43.64612, 51.6962], + "1.5833": [-45.4205, 50.0299, 22.91251], + "1.7917": [-55.05265, 51.17525, 20.66004], + "1.875": [-75.05265, 51.17525, 20.66004], + "2.0": [-72.61006, 53.6379, 21.09444] + }, + "position": { + "0.0": [0, 0, 0], + "1.4583": [0, 0, 0], + "1.5417": [0, 0, -2], + "1.5833": [2, -1, -1] + } }, "head3": { - "rotation": ["15-math.sin(q.anim_time*90*0.5-120)*2", 0, "math.sin(q.anim_time*90*0.5)*2"] + "rotation": { + "0.0": [2.5, 10, 0], + "0.125": [26.29192, -5.79079, -0.61574], + "0.25": [24.46575, 1.13863, -8.88439], + "0.3333": [12.1489, 0.86021, -17.73789], + "0.5417": [-6.97807, 0.98026, -11.25283], + "1.0417": [-6.10504, 1.1003, -4.76777], + "1.2083": [-12.4965, -6.34213, -3.14595], + "1.3333": [-23.50921, -24.0306, -10.86454], + "1.4583": [-34.8005, -28.89867, -17.71534], + "1.5417": [-85.23539, -55.00144, -26.9249], + "1.5833": [-52.52815, -46.72055, -18.47263], + "1.7083": [-52.52815, -46.72055, -18.47263], + "1.7917": [-52.52815, -46.72055, -18.47263], + "1.875": [-85.23539, -55.00144, -26.9249], + "2.0": [-80.23539, -55.00144, -26.9249] + }, + "position": { + "0.0": [0, 0, 0], + "1.2083": [0, 0, 0], + "1.3333": [-1, 0, 0], + "1.4583": [-1, 0, 0], + "1.5417": [-2, 0, -2], + "1.5833": [-2, -0.5, -1], + "1.7917": [-2, -0.5, -1], + "1.875": [-2, 0, -2] + } + }, + "leaf_set10": { + "rotation": { + "0.0": [0, 0, 0], + "1.0833": [0, 0, 0], + "1.2917": [-35, 35, -15], + "1.4167": [-30, 35, -15] + }, + "position": { + "0.0": [0, 0, 0], + "1.0833": [0, 0, 0] + } }, "leaf28": { - "rotation": ["-2.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + "rotation": { + "0.0": [0, 0, 0], + "1.5417": [0, 0, 0], + "1.6667": [3.97363, 9.76039, 0.62983] + }, + "position": { + "0.0": [0, 0, 0], + "1.5417": [0, 0, 0], + "1.6667": [2, 0, 2] + } }, "leaf29": { - "rotation": ["-17.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] + "rotation": { + "0.0": [0, 0, 0], + "1.0417": [0, 0, 0], + "1.2917": [-35, 0, 0], + "1.4167": [-47.5, 0, 0], + "1.6667": [-30, 0, 0], + "1.875": [-77.5, 0, 0], + "2.0417": [-40, 0, 0], + "2.1667": [-35, 0, 0] + } }, "leaf30": { - "rotation": ["-22.5+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf37": { - "rotation": ["-5+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf38": { - "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf39": { - "rotation": ["-15+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf": { - "rotation": ["2.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf2": { - "rotation": ["-10+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf3": { - "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf4": { - "rotation": ["0+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf5": { - "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf6": { - "rotation": ["-15+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf23": { - "rotation": ["-22.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf24": { - "rotation": ["-12.5+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf31": { - "rotation": ["20+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf32": { - "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf33": { - "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf34": { - "rotation": ["10+math.sin(q.anim_time*90*1-60)*3", 7.5, -2.5] - }, - "leaf35": { - "rotation": ["-10+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf36": { - "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf25": { - "rotation": ["10+math.sin(q.anim_time*90*1-60)*3", -7.5, 2.5] - }, - "leaf26": { - "rotation": ["-10+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf27": { - "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf7": { - "rotation": ["2.5+math.sin(q.anim_time*90*1-60)*3", 0, "-math.sin(q.anim_time*90*1-60)*2"] - }, - "leaf8": { - "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf9": { - "rotation": ["0+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf10": { - "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf11": { - "rotation": ["-32.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf12": { - "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf13": { - "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf14": { - "rotation": ["-30+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf15": { - "rotation": ["-5+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf16": { - "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "leaf17": { - "rotation": ["-32.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf18": { - "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf19": { - "rotation": ["2.5+math.sin(q.anim_time*90*1-60)*3", 0, "math.sin(q.anim_time*90*1-60)*2"] - }, - "leaf20": { - "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] - }, - "leaf21": { - "rotation": ["0+math.sin(q.anim_time*90*1-180)*8", 0, 0] - }, - "leaf22": { - "rotation": ["0+math.sin(q.anim_time*90*1-60)*3", 0, 0] - }, - "mouth_closed": { - "position": [0, 0, -0.1] - }, - "mouth_open": { - "position": [0, 0, 1] - }, - "eyelid_left": { - "position": [0.1, 0, -0.1] - }, - "eyelid_right": { - "position": [-0.1, 0, -0.1] - }, - "mouth_closed2": { - "position": [0, 0, -0.1] - }, - "mouth_open2": { - "position": [0, 0, 1] - }, - "eyelid_left2": { - "position": [0.1, 0, -0.1] - }, - "eyelid_right2": { - "position": [-0.1, 0, -0.1] - }, - "mouth_closed3": { - "position": [0, 0, -0.1] - }, - "mouth_open3": { - "position": [0, 0, 1] - }, - "eyelid_left3": { - "position": [0.1, 0, -0.1] - }, - "eyelid_right3": { - "position": [-0.1, 0, -0.1] - } - } - }, - "animation.exeggutor.faint": { - "loop": true, - "animation_length": 3, - "bones": { - "body": { - "rotation": { - "0.0": [0, 0, 0], - "1.0417": [-12.5, 0, 0], - "1.1667": [32.5, 0, 0], - "1.2917": [77.5, 0, 0], - "1.4167": [82.5, 0, 0], - "1.5417": [102.5, 0, 0], - "1.5833": [107.5, 0, 0], - "1.6667": [105, 0, 0], - "1.7083": [102.5, 0, 0], - "1.7917": [100, 0, 0], - "1.875": [105, 0, 0], - "1.9167": [102.5, 0, 0], - "2.0": [105, 0, 0] - }, - "position": { - "0.0": [0, -2.5, 0], - "0.125": [0, -1.1, 0], - "1.0417": [0, -1.1, 0], - "1.1667": [0, -0.1, 4], - "1.2917": [0, 10.9, 8], - "1.4167": [0, 12.9, 8], - "1.5417": [0, 7.9, 6], - "1.5833": [0, 10.9, 5], - "1.6667": [0, 10.9, 3], - "1.7083": [0, 9.9, 2.5], - "1.7917": [0, 7.9, 2], - "1.9167": [0, 7.9, 1.5], - "2.0833": [0, 7.9, 0.5], - "2.25": [0, 7.9, 0.25] - } - }, - "torso": { - "rotation": { - "0.0": [17.5, 0, 0], - "0.125": [-20, 0, 0], - "0.4583": { - "pre": [-7.91907, -21.39099, 8.6801], - "post": [-7.91907, -21.39099, 8.6801], - "lerp_mode": "catmullrom" - }, - "1.0417": { - "post": [-17.21055, -5.69391, 15.99181], - "lerp_mode": "catmullrom" - }, - "1.1667": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.4167": [-12.5, 0, 0], - "1.5417": [-25, 0, 0], - "1.6667": [-30, 0, 0], - "1.7917": [-22.86, 0, 0], - "1.9583": [-25, 0, 0] - }, - "position": { - "0.0": [0, 1, 2], - "0.125": [0, 3, -4], - "1.0417": [0, 3, -4], - "1.4167": [0, 3, -5] - } - }, - "head": { - "rotation": { - "0.0": [0, 0, 0], - "0.125": [17.5, 0, 0], - "0.3333": [17.5, 0, 0], - "0.4583": [2.5, 0, 0], - "1.0417": [-2.5, 0, 0], - "1.2083": [-10, 0, 0], - "1.3333": [-20, 0, 0], - "1.4583": [-30, 0, 0], - "1.5417": [-72.5, 0, 0], - "1.5833": [-52.5, 0, 0], - "1.875": [-55, 0, 0], - "1.9583": [-82.5, 0, 0], - "2.0833": [-80, 0, 0] - }, - "position": [0, 0, 0] - }, - "head2": { - "rotation": { - "0.0": [0, 10, 0], - "0.125": [27.5, 10, 0], - "0.25": [32.21647, -3.67263, -11.51342], - "0.3333": [28.64518, 0.93492, -7.44828], - "1.0417": [3.81324, 5.9337, -7.64947], - "1.2083": [-6.25548, -1.39166, -4.61789], - "1.3333": [-24.63403, 2.34891, 13.75642], - "1.4583": [-39.93378, 7.53065, 23.25433], - "1.5417": [-92.06708, 43.64612, 51.6962], - "1.5833": [-45.4205, 50.0299, 22.91251], - "1.875": [-55.05265, 51.17525, 20.66004], - "1.9583": [-75.05265, 51.17525, 20.66004], - "2.0833": [-72.61006, 53.6379, 21.09444] - }, - "position": { - "0.0": [0, 0, 0], - "1.4583": [0, 0, 0], - "1.5417": [0, 0, -2], - "1.5833": [2, -1, -1] - } - }, - "head3": { - "rotation": { - "0.0": [2.5, 10, 0], - "0.125": [26.29192, -5.79079, -0.61574], - "0.25": [24.46575, 1.13863, -8.88439], - "0.3333": [12.1489, 0.86021, -17.73789], - "0.5417": [-6.97807, 0.98026, -11.25283], - "1.0417": [-6.10504, 1.1003, -4.76777], - "1.2083": [-12.4965, -6.34213, -3.14595], - "1.3333": [-23.50921, -24.0306, -10.86454], - "1.4583": [-34.8005, -28.89867, -17.71534], - "1.5417": [-85.23539, -55.00144, -26.9249], - "1.5833": [-52.52815, -46.72055, -18.47263], - "1.7083": [-52.52815, -46.72055, -18.47263], - "1.875": [-52.52815, -46.72055, -18.47263], - "1.9583": [-85.23539, -55.00144, -26.9249], - "2.0833": [-80.23539, -55.00144, -26.9249] - }, - "position": { - "0.0": [0, 0, 0], - "1.2083": [0, 0, 0], - "1.3333": [-1, 0, 0], - "1.4583": [-1, 0, 0], - "1.5417": [-2, 0, -2], - "1.5833": [-2, -0.5, -1], - "1.875": [-2, -0.5, -1], - "1.9583": [-2, 0, -2] - } - }, - "leaf_set10": { - "rotation": { - "0.0": [0, 0, 0], - "1.0833": [0, 0, 0], - "1.2917": [-35, 35, -15], - "1.4167": [-30, 35, -15] - }, - "position": { - "0.0": [0, 0, 0], - "1.0833": [0, 0, 0] - } - }, - "leaf28": { - "rotation": { - "0.0": [0, 0, 0], - "1.5417": [0, 0, 0], - "1.6667": [3.97363, 9.76039, 0.62983] - }, - "position": { - "0.0": [0, 0, 0], - "1.5417": [0, 0, 0], - "1.6667": [2, 0, 2] - } - }, - "leaf29": { - "rotation": { - "0.0": [0, 0, 0], - "1.0417": [0, 0, 0], - "1.2917": [-35, 0, 0], - "1.4167": [-47.5, 0, 0], - "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.125": [-40, 0, 0], - "2.25": [-35, 0, 0] - } - }, - "leaf30": { - "rotation": { - "0.0": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.4583": [-47.5, 0, 0], - "1.5417": [-77.5, 0, 0], - "1.5833": [-95, 0, 0], - "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] - } + "rotation": { + "0.0": [0, 0, 0], + "1.1667": [0, 0, 0], + "1.4583": [-47.5, 0, 0], + "1.5417": [-77.5, 0, 0], + "1.5833": [-95, 0, 0], + "1.6667": [-30, 0, 0], + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] + } }, "leaf_set13": { "rotation": { @@ -964,9 +885,9 @@ "1.2917": [-35, 0, 0], "1.4167": [-47.5, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.125": [-40, 0, 0], - "2.25": [-35, 0, 0] + "1.875": [-77.5, 0, 0], + "2.0417": [-40, 0, 0], + "2.1667": [-35, 0, 0] } }, "leaf39": { @@ -977,10 +898,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leaf_set": { @@ -1016,10 +937,9 @@ "1.4583": [-77.5, 0, 0], "1.5417": [-95, 0, 0], "1.5833": [-30, 0, 0], - "1.875": [-77.5, 0, 0], - "1.9583": [-95, 0, 0], - "2.0833": [-40, 0, 0], - "2.1667": [-35, 0, 0] + "1.875": [-95, 0, 0], + "2.0": [-40, 0, 0], + "2.0833": [-35, 0, 0] }, "position": { "0.0": [0, 0, 0], @@ -1034,10 +954,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leaf_set2": { @@ -1073,10 +993,9 @@ "1.4583": [-77.5, 0, 0], "1.5417": [-95, 0, 0], "1.5833": [-30, 0, 0], - "1.875": [-77.5, 0, 0], - "1.9583": [-95, 0, 0], - "2.0833": [-40, 0, 0], - "2.1667": [-35, 0, 0] + "1.875": [-95, 0, 0], + "2.0": [-40, 0, 0], + "2.0833": [-35, 0, 0] }, "position": { "0.0": [0, 0, 0], @@ -1091,10 +1010,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leaf_set8": { @@ -1130,10 +1049,9 @@ "1.4583": [-77.5, 0, 0], "1.5417": [-95, 0, 0], "1.5833": [-30, 0, 0], - "1.875": [-77.5, 0, 0], - "1.9583": [-95, 0, 0], - "2.0833": [-40, 0, 0], - "2.1667": [-35, 0, 0] + "1.875": [-95, 0, 0], + "2.0": [-40, 0, 0], + "2.0833": [-35, 0, 0] }, "position": { "0.0": [0, 0, 0], @@ -1148,10 +1066,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leg_left": { @@ -1340,9 +1258,9 @@ "1.4583": [-47.5, 0, 0], "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], - "1.9583": [17.5, 0, 0], - "2.1667": [-0.28, 0, 0], - "2.4583": [-2.5, 0, 0] + "1.875": [17.5, 0, 0], + "2.0833": [-0.28, 0, 0], + "2.375": [-2.5, 0, 0] } }, "leaf34": { @@ -1367,9 +1285,9 @@ "1.2917": [-20, 0, 0], "1.4167": [-30, 0, 0], "1.6667": [7.5, 0, 0], - "1.9583": [-62.5, 0, 0], - "2.125": [-12.5, 0, 0], - "2.2917": [-2.5, 0, 0] + "1.875": [-62.5, 0, 0], + "2.0417": [-12.5, 0, 0], + "2.2083": [-2.5, 0, 0] } }, "leaf36": { @@ -1380,10 +1298,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leaf25": { @@ -1408,9 +1326,9 @@ "1.2917": [-20, 0, 0], "1.4167": [-30, 0, 0], "1.6667": [7.5, 0, 0], - "1.9583": [-62.5, 0, 0], - "2.125": [-12.5, 0, 0], - "2.2917": [-2.5, 0, 0] + "1.875": [-62.5, 0, 0], + "2.0417": [-12.5, 0, 0], + "2.2083": [-2.5, 0, 0] } }, "leaf27": { @@ -1421,10 +1339,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leaf7": { @@ -1450,11 +1368,10 @@ "1.4167": [-37.5, 0, 0], "1.4583": [-77.5, 0, 0], "1.5417": [-95, 0, 0], - "1.5833": [-30, 0, 0], - "1.875": [-77.5, 0, 0], - "1.9583": [-95, 0, 0], - "2.0833": [-40, 0, 0], - "2.1667": [-35, 0, 0] + "1.5833": [-30, 0, 0], + "1.875": [-95, 0, 0], + "2.0": [-40, 0, 0], + "2.0833": [-35, 0, 0] }, "position": { "0.0": [0, 0, 0], @@ -1469,10 +1386,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } }, "leaf10": { @@ -1513,9 +1430,9 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.4167": [-40, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.3333": [-40, 0, 0] } }, "leaf13": { @@ -1556,9 +1473,9 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.4167": [-40, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.3333": [-40, 0, 0] } }, "leaf16": { @@ -1599,9 +1516,9 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.4167": [-40, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.3333": [-40, 0, 0] } }, "leaf19": { @@ -1628,10 +1545,9 @@ "1.4583": [-77.5, 0, 0], "1.5417": [-95, 0, 0], "1.5833": [-30, 0, 0], - "1.875": [-77.5, 0, 0], - "1.9583": [-95, 0, 0], - "2.0833": [-40, 0, 0], - "2.1667": [-35, 0, 0] + "1.875": [-95, 0, 0], + "2.0": [-40, 0, 0], + "2.0833": [-35, 0, 0] }, "position": { "0.0": [0, 0, 0], @@ -1646,10 +1562,10 @@ "1.5417": [-77.5, 0, 0], "1.5833": [-95, 0, 0], "1.6667": [-30, 0, 0], - "1.9583": [-77.5, 0, 0], - "2.0": [-95, 0, 0], - "2.125": [-40, 0, 0], - "2.375": [-20, 0, 0] + "1.875": [-77.5, 0, 0], + "1.9167": [-95, 0, 0], + "2.0417": [-40, 0, 0], + "2.2917": [-20, 0, 0] } } } @@ -1711,160 +1627,195 @@ } } }, - "animation.exeggutor.cry": { - "animation_length": 1.5, + "animation.exeggutor.sleep": { + "loop": true, "bones": { - "neck": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [10, 0, 0], - "1.25": [10, 0, 0], - "1.5": [0, 0, 0] - } + "leg_left": { + "rotation": [-90, -30, 0], + "position": [0, -0.5, -4] }, - "mouth": { - "position": { - "0.0": [0, 0, 0], - "0.25": [0, -2, 0], - "1.25": [0, -2, 0], - "1.5": [0, 0, 0] - } + "foot_left": { + "rotation": [5, 0, 0] }, - "mouth2": { - "position": { - "0.0": [0, 0, 0], - "0.25": [0, -5, 0], - "1.25": [0, -5, 0], - "1.5": [0, 0, 0] - } + "leg_right": { + "rotation": [-90, 30, 0], + "position": [0, -1.5, -4] }, - "jaw": { - "position": { - "0.0": [0, 0, 0], - "0.25": [0, -3, 0], - "1.25": [0, -3, 0], - "1.5": [0, 0, 0] - } + "foot_right": { + "rotation": [5, 0, 0] + }, + "body": { + "position": [0, -13.5, 3] + }, + "torso": { + "rotation": ["12.5+math.sin(q.anim_time*90*1+45)*1", 0, 0], + "position": [0, 0.5, 0] }, "head": { - "rotation": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": [-2.5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.25": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - } + "rotation": ["15-math.sin(q.anim_time*90*0.5-60)*2", 0, "math.sin(q.anim_time*90*1)*2"] + }, + "head2": { + "rotation": ["15-math.sin(q.anim_time*90*0.5-120)*2", 0, "math.sin(q.anim_time*90*0.5)*2"] + }, + "head3": { + "rotation": ["15-math.sin(q.anim_time*90*0.5-120)*2", 0, "math.sin(q.anim_time*90*0.5)*2"] + }, + "leaf28": { + "rotation": ["-2.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + }, + "leaf29": { + "rotation": ["-17.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf30": { + "rotation": ["-22.5+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf37": { + "rotation": ["-5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + }, + "leaf38": { + "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf39": { + "rotation": ["-15+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf": { + "rotation": ["2.5+math.sin(q.anim_time*90*1-60)*3", 0, 0] + }, + "leaf2": { + "rotation": ["-10+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf3": { + "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf4": { + "rotation": ["0+math.sin(q.anim_time*90*1-60)*3", 0, 0] + }, + "leaf5": { + "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf6": { + "rotation": ["-15+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf23": { + "rotation": ["-22.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf24": { + "rotation": ["-12.5+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf31": { + "rotation": ["20+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 1, 0] + }, + "leaf32": { + "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf33": { + "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf34": { + "rotation": ["10+math.sin(q.anim_time*90*1-60)*3", 7.5, -2.5] + }, + "leaf35": { + "rotation": ["-10+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf36": { + "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf25": { + "rotation": ["10+math.sin(q.anim_time*90*1-60)*3", -7.5, 2.5] + }, + "leaf26": { + "rotation": ["-10+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf27": { + "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf7": { + "rotation": ["2.5+math.sin(q.anim_time*90*1-60)*3", 0, "-math.sin(q.anim_time*90*1-60)*2"] + }, + "leaf8": { + "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf9": { + "rotation": ["0+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf10": { + "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 1, 0] + }, + "leaf11": { + "rotation": ["-32.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf12": { + "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf13": { + "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 2, 0] + }, + "leaf14": { + "rotation": ["-30+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf15": { + "rotation": ["-5+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf16": { + "rotation": ["27.5+math.sin(q.anim_time*90*1-60)*3", 0, 0], + "position": [0, 1, 0] + }, + "leaf17": { + "rotation": ["-32.5+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf18": { + "rotation": ["-10+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf19": { + "rotation": ["2.5+math.sin(q.anim_time*90*1-60)*3", 0, "math.sin(q.anim_time*90*1-60)*2"] + }, + "leaf20": { + "rotation": ["-20+math.sin(q.anim_time*90*1-120)*6", 0, 0] + }, + "leaf21": { + "rotation": ["0+math.sin(q.anim_time*90*1-180)*8", 0, 0] + }, + "leaf22": { + "rotation": ["0+math.sin(q.anim_time*90*1-60)*3", 0, 0] }, "mouth_closed": { - "position": { - "0.25": [0, 0, -0.1], - "0.3333": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.25": [0, 0, -0.1] - } + "position": [0, 0, -0.1] }, "mouth_open": { - "position": { - "0.0": [0, 0, 0.1], - "0.25": [0, 0, 0], - "1.25": [0, 0, 0], - "1.5": [0, 0, 0.1] - } + "position": [0, 0, 1] }, - "head2": { - "rotation": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": [-5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.25": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - } + "eyelid_left": { + "position": [0.1, 0, -0.1] + }, + "eyelid_right": { + "position": [-0.1, 0, -0.1] }, "mouth_closed2": { - "position": { - "0.25": [0, 0, -0.1], - "0.3333": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.25": [0, 0, -0.1] - } + "position": [0, 0, -0.1] }, "mouth_open2": { - "position": { - "0.0": [0, 0, 0.1], - "0.25": [0, 0, 0], - "1.25": [0, 0, 0], - "1.5": [0, 0, 0.1] - } + "position": [0, 0, 1] }, - "head3": { - "rotation": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.25": { - "post": [-15, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - } + "eyelid_left2": { + "position": [0.1, 0, -0.1] + }, + "eyelid_right2": { + "position": [-0.1, 0, -0.1] }, "mouth_closed3": { - "position": { - "0.25": [0, 0, -0.1], - "0.3333": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.25": [0, 0, -0.1] - } + "position": [0, 0, -0.1] }, "mouth_open3": { - "position": { - "0.0": [0, 0, 0.1], - "0.25": [0, 0, 0], - "1.25": [0, 0, 0], - "1.5": [0, 0, 0.1] - } + "position": [0, 0, 1] + }, + "eyelid_left3": { + "position": [0.1, 0, -0.1] + }, + "eyelid_right3": { + "position": [-0.1, 0, -0.1] } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json index f432b5bdf5..2648579a58 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json @@ -708,7 +708,7 @@ } }, "animation.exeggutor_alolan.blink": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "eyelid_right": { "position": { @@ -739,7 +739,7 @@ "eyelid_left2": { "position": { "0.0": [0.1, 0, -0.1], - "0.125": [0.1, 0, -0.1], + "0.125": [-0.1, 0, -0.1], "0.1667": [0, 0, 0] } } @@ -783,115 +783,6 @@ } } }, - "animation.exeggutor_alolan.cry": { - "animation_length": 1.5, - "bones": { - "mouth": { - "position": { - "0.0": [0, 0, 0], - "0.25": [0, -2, 0], - "1.25": [0, -2, 0], - "1.5": [0, 0, 0] - } - }, - "mouth2": { - "position": { - "0.0": [0, 0, 0], - "0.25": [0, -5, 0], - "1.25": [0, -5, 0], - "1.5": [0, 0, 0] - } - }, - "jaw": { - "position": { - "0.0": [0, 0, 0], - "0.25": [0, -3, 0], - "1.25": [0, -3, 0], - "1.5": [0, 0, 0] - } - }, - "head": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [-15, 0, 0], - "1.25": [-15, 0, 0], - "1.5": [0, 0, 0] - } - }, - "mouth_closed": { - "position": { - "0.25": [0, 0, -0.1], - "0.3333": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.25": [0, 0, -0.1] - } - }, - "mouth_open": { - "position": { - "0.0": [0, 0, 0.1], - "0.25": [0, 0, 0], - "1.25": [0, 0, 0], - "1.5": [0, 0, 0.1] - } - }, - "head2": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [-15, 0, 0], - "1.25": [-15, 0, 0], - "1.5": [0, 0, 0] - } - }, - "mouth_closed2": { - "position": { - "0.25": [0, 0, -0.1], - "0.3333": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.25": [0, 0, -0.1] - } - }, - "mouth_open2": { - "position": { - "0.0": [0, 0, 0.1], - "0.25": [0, 0, 0], - "1.25": [0, 0, 0], - "1.5": [0, 0, 0.1] - } - }, - "head3": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [-15, 0, 0], - "1.25": [-15, 0, 0], - "1.5": [0, 0, 0] - } - }, - "mouth_closed3": { - "position": { - "0.25": [0, 0, -0.1], - "0.3333": [0, 0, 0], - "1.1667": [0, 0, 0], - "1.25": [0, 0, -0.1] - } - }, - "mouth_open3": { - "position": { - "0.0": [0, 0, 0.1], - "0.25": [0, 0, 0], - "1.25": [0, 0, 0], - "1.5": [0, 0, 0.1] - } - }, - "neck": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [10, 0, 0], - "1.25": [10, 0, 0], - "1.5": [0, 0, 0] - } - } - } - }, "animation.exeggutor_alolan.sleep": { "loop": true, "bones": { @@ -910,7 +801,7 @@ "rotation": [-5, 0, 0] }, "body": { - "position": [0, -8, 1] + "position": [0, -16, 1] }, "torso": { "rotation": ["0+math.sin(q.anim_time*90*1+45)*0.1", 0, 0], @@ -1048,21 +939,15 @@ "mouth_open": { "position": [0, 0, 1] }, - "eyelid_left": { - "position": [0.1, 0, -0.1] - }, "eyelid_right": { "position": [-0.1, 0, -0.1] }, "mouth_closed2": { - "position": [0, 0, -0.1] + "position": [0, 0, 0] }, "mouth_open2": { "position": [0, 0, 1] }, - "eyelid_left2": { - "position": [0.1, 0, -0.1] - }, "eyelid_right2": { "position": [-0.1, 0, -0.1] }, @@ -1122,6 +1007,134 @@ }, "neck11": { "rotation": ["math.sin(q.anim_time*90*1-135)*2", 0, "math.sin(q.anim_time*90*1-250)*0.5"] + }, + "eyelid_left": { + "position": [0.1, 0, -0.1] + }, + "eyelid_left2": { + "position": [0.1, 0, -0.1] + } + } + }, + "animation.exeggutor_alolan.new": { + "loop": true, + "bones": { + "body": { + "scale": 0.9 + }, + "neck11": { + "position": [0, -230, 0] + } + } + }, + "animation.exeggutor_alolan.new2": { + "loop": true, + "bones": { + "body": { + "scale": 1.2 + } + } + }, + "animation.exeggutor_alolan.cry": { + "animation_length": 1.5, + "bones": { + "mouth": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, -2, 0], + "1.25": [0, -2, 0], + "1.5": [0, 0, 0] + } + }, + "mouth2": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, -5, 0], + "1.25": [0, -5, 0], + "1.5": [0, 0, 0] + } + }, + "jaw": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, -3, 0], + "1.25": [0, -3, 0], + "1.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-15, 0, 0], + "1.25": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "mouth_closed": { + "position": { + "0.0": [0, 0, -0.1], + "0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]} + } + }, + "mouth_open": { + "position": { + "0.0": [0, 0, 0.1], + "0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]} + } + }, + "head2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-15, 0, 0], + "1.25": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "mouth_closed2": { + "position": { + "0.0": [0, 0, 0], + "0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.2]}, + "1.25": {"pre": [0, 0, 0.2], "post": [0, 0, 0]} + } + }, + "mouth_open2": { + "position": { + "0.0": [0, 0, 0], + "0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}, + "1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]} + } + }, + "head3": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-15, 0, 0], + "1.25": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "mouth_closed3": { + "position": { + "0.0": [0, 0, -0.1], + "0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]} + } + }, + "mouth_open3": { + "position": { + "0.0": [0, 0, 0.1], + "0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]} + } + }, + "neck": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [10, 0, 0], + "1.25": [10, 0, 0], + "1.5": [0, 0, 0] + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0836_boltund/boltund.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0836_boltund/boltund.animation.json index 8b23864c12..71b2a7632e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0836_boltund/boltund.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0836_boltund/boltund.animation.json @@ -1315,17 +1315,35 @@ "eyelid_right": { "position": { "0.0": [0, 0, 0], - "0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, - "0.7083": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}, - "1.7083": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]} + "0.1667": { + "pre": [0, 0, 0], + "post": [-0.1, 0, -0.1] + }, + "0.7083": { + "pre": [-0.1, 0, -0.1], + "post": [0, 0, 0] + }, + "1.7083": { + "pre": [0, 0, 0], + "post": [-0.1, 0, -0.1] + } } }, "eyelid_left": { "position": { "0.0": [0, 0, 0], - "0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, - "0.7083": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}, - "1.7083": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]} + "0.1667": { + "pre": [0, 0, 0], + "post": [0.1, 0, -0.1] + }, + "0.7083": { + "pre": [0.1, 0, -0.1], + "post": [0, 0, 0] + }, + "1.7083": { + "pre": [0, 0, 0], + "post": [0.1, 0, -0.1] + } } }, "jaw": { @@ -1719,11 +1737,6 @@ "0.2083": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]} } } - }, - "sound_effects": { - "0.0": { - "effect": "pokemon.boltund.cry" - } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_alolan.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_alolan.geo.json index 817ca3cc2f..3447f8477c 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_alolan.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_alolan.geo.json @@ -18,14 +18,115 @@ { "name": "body", "parent": "raticate_alolan", - "pivot": [0, 5.7, 0], + "pivot": [0, 5.7, 0] + }, + { + "name": "torso", + "parent": "body", + "pivot": [1, 5.7, -2], "cubes": [ {"origin": [-6, 1.2, -5.5], "size": [12, 10, 11], "uv": [0, 0]} ] }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 5.7, 7.5], + "cubes": [ + {"origin": [-1.5, 2.7, 4.5], "size": [3, 3, 11], "inflate": 0.02, "uv": [1, 50]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 3.2, 15.5], + "cubes": [ + {"origin": [-1, 3.2, 15.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [39, 21]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 3.2, 20.3], + "cubes": [ + {"origin": [-1, 3.2, 20.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [16, 42]} + ] + }, + { + "name": "tail4", + "parent": "tail3", + "pivot": [0, 3.7, 25.3], + "cubes": [ + {"origin": [-0.5, 3.7, 25.3], "size": [1, 1, 5], "inflate": 0.02, "uv": [46, 14]} + ] + }, + { + "name": "hand_left", + "parent": "torso", + "pivot": [5.5, 6.65, -5.3], + "cubes": [ + {"origin": [5.1, 6.2, -6.3], "size": [2, 1, 2], "inflate": 0.01, "uv": [56, 13]} + ] + }, + { + "name": "finger_back_left", + "parent": "hand_left", + "pivot": [7.1, 7.2, -4.4], + "cubes": [ + {"origin": [7.1, 6.2, -4.4], "size": [2, 1, 0], "uv": [31, 27]} + ] + }, + { + "name": "finger_middle_left", + "parent": "hand_left", + "pivot": [7.1, 7.2, -5.3], + "cubes": [ + {"origin": [7.1, 6.2, -5.3], "size": [2, 1, 0], "uv": [31, 28]} + ] + }, + { + "name": "finger_front_left", + "parent": "hand_left", + "pivot": [7.1, 7.2, -6.2], + "cubes": [ + {"origin": [7.1, 6.2, -6.2], "size": [2, 1, 0], "uv": [31, 29]} + ] + }, + { + "name": "hand_right", + "parent": "torso", + "pivot": [-5.5, 6.65, -5.3], + "cubes": [ + {"origin": [-7.1, 6.2, -6.3], "size": [2, 1, 2], "inflate": 0.01, "uv": [56, 16]} + ] + }, + { + "name": "finger_back_right", + "parent": "hand_right", + "pivot": [-7.1, 7.2, -4.4], + "cubes": [ + {"origin": [-9.1, 6.2, -4.4], "size": [2, 1, 0], "uv": [35, 27]} + ] + }, + { + "name": "finger_middle_right", + "parent": "hand_right", + "pivot": [-7.1, 7.2, -5.3], + "cubes": [ + {"origin": [-9.1, 6.2, -5.3], "size": [2, 1, 0], "uv": [35, 28]} + ] + }, + { + "name": "finger_front_right", + "parent": "hand_right", + "pivot": [-7.1, 7.2, -6.2], + "cubes": [ + {"origin": [-9.1, 6.2, -6.2], "size": [2, 1, 0], "uv": [35, 29]} + ] + }, { "name": "head", - "parent": "body", + "parent": "torso", "pivot": [0, 11.2, 0.8], "rotation": [5, 0, 0], "cubes": [ @@ -161,7 +262,7 @@ "parent": "eyes", "pivot": [-3.61, 15.47095, -6.23179], "cubes": [ - {"origin": [-4.61, 14.47095, -6.23179], "size": [2, 2, 0], "uv": [38, 21]} + {"origin": [-4.61, 14.47095, -6.21], "size": [2, 2, 0], "uv": [38, 21]} ] }, { @@ -169,7 +270,7 @@ "parent": "eye_right", "pivot": [-3.42, 15.60095, -6.24179], "cubes": [ - {"origin": [-3.92, 15.10095, -6.24179], "size": [1, 1, 0], "uv": [38, 25]} + {"origin": [-3.92, 15.10095, -6.22], "size": [1, 1, 0], "uv": [38, 25]} ] }, { @@ -185,7 +286,7 @@ "parent": "eyes", "pivot": [3.61, 15.47095, -6.23179], "cubes": [ - {"origin": [2.61, 14.47095, -6.23179], "size": [2, 2, 0], "uv": [38, 21], "mirror": true} + {"origin": [2.61, 14.47095, -6.21], "size": [2, 2, 0], "uv": [38, 21], "mirror": true} ] }, { @@ -193,7 +294,7 @@ "parent": "eye_left", "pivot": [3.42, 15.60095, -6.24179], "cubes": [ - {"origin": [2.92, 15.10095, -6.24179], "size": [1, 1, 0], "uv": [38, 25], "mirror": true} + {"origin": [2.92, 15.10095, -6.22], "size": [1, 1, 0], "uv": [38, 25], "mirror": true} ] }, { @@ -204,70 +305,6 @@ {"origin": [1.91, 14.75, -6.12], "size": [3, 2, 1], "inflate": 0.01, "uv": [25, 42]} ] }, - { - "name": "hand_right", - "parent": "body", - "pivot": [-5.5, 6.65, -5.3], - "cubes": [ - {"origin": [-7.1, 6.2, -6.3], "size": [2, 1, 2], "inflate": 0.01, "uv": [56, 16]} - ] - }, - { - "name": "finger_back_right", - "parent": "hand_right", - "pivot": [-7.1, 7.2, -4.4], - "cubes": [ - {"origin": [-9.1, 6.2, -4.4], "size": [2, 1, 0], "uv": [35, 27]} - ] - }, - { - "name": "finger_middle_right", - "parent": "hand_right", - "pivot": [-7.1, 7.2, -5.3], - "cubes": [ - {"origin": [-9.1, 6.2, -5.3], "size": [2, 1, 0], "uv": [35, 28]} - ] - }, - { - "name": "finger_front_right", - "parent": "hand_right", - "pivot": [-7.1, 7.2, -6.2], - "cubes": [ - {"origin": [-9.1, 6.2, -6.2], "size": [2, 1, 0], "uv": [35, 29]} - ] - }, - { - "name": "hand_left", - "parent": "body", - "pivot": [5.5, 6.65, -5.3], - "cubes": [ - {"origin": [5.1, 6.2, -6.3], "size": [2, 1, 2], "inflate": 0.01, "uv": [56, 13]} - ] - }, - { - "name": "finger_back_left", - "parent": "hand_left", - "pivot": [7.1, 7.2, -4.4], - "cubes": [ - {"origin": [7.1, 6.2, -4.4], "size": [2, 1, 0], "uv": [31, 27]} - ] - }, - { - "name": "finger_middle_left", - "parent": "hand_left", - "pivot": [7.1, 7.2, -5.3], - "cubes": [ - {"origin": [7.1, 6.2, -5.3], "size": [2, 1, 0], "uv": [31, 28]} - ] - }, - { - "name": "finger_front_left", - "parent": "hand_left", - "pivot": [7.1, 7.2, -6.2], - "cubes": [ - {"origin": [7.1, 6.2, -6.2], "size": [2, 1, 0], "uv": [31, 29]} - ] - }, { "name": "foot_right", "parent": "body", @@ -307,38 +344,6 @@ {"origin": [3.55, 0, -6], "size": [0, 1, 3], "uv": [31, 20]}, {"origin": [2.3, 0, -6], "size": [0, 1, 3], "pivot": [2.3, 0.5, -3], "rotation": [0, 10, 0], "uv": [31, 22]} ] - }, - { - "name": "tail", - "parent": "body", - "pivot": [0, 5.7, 7.5], - "cubes": [ - {"origin": [-1.5, 2.7, 4.5], "size": [3, 3, 11], "inflate": 0.02, "uv": [1, 50]} - ] - }, - { - "name": "tail2", - "parent": "tail", - "pivot": [0, 3.2, 15.5], - "cubes": [ - {"origin": [-1, 3.2, 15.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [39, 21]} - ] - }, - { - "name": "tail3", - "parent": "tail2", - "pivot": [0, 3.2, 20.3], - "cubes": [ - {"origin": [-1, 3.2, 20.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [16, 42]} - ] - }, - { - "name": "tail4", - "parent": "tail3", - "pivot": [0, 3.7, 25.3], - "cubes": [ - {"origin": [-0.5, 3.7, 25.3], "size": [1, 1, 5], "inflate": 0.02, "uv": [46, 14]} - ] } ] } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_female.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_female.geo.json index 2330f08bc1..ee34439f82 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_female.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_female.geo.json @@ -18,14 +18,19 @@ { "name": "body", "parent": "raticate", - "pivot": [0, 5.7, 0], + "pivot": [0, 5.7, 0] + }, + { + "name": "torso", + "parent": "body", + "pivot": [1, 5.7, -2], "cubes": [ {"origin": [-5.5, 1.2, -5.5], "size": [11, 10, 11], "uv": [0, 0]} ] }, { "name": "head", - "parent": "body", + "parent": "torso", "pivot": [0, 11.2, -0.2], "rotation": [10, 0, 0], "cubes": [ @@ -223,7 +228,7 @@ }, { "name": "arm_right", - "parent": "body", + "parent": "torso", "pivot": [-5.1, 7.2, -4.25], "cubes": [ {"origin": [-7.2, 6.7, -5.3], "size": [4, 1, 2], "inflate": -0.1, "uv": [0, 51]} @@ -263,7 +268,7 @@ }, { "name": "arm_left", - "parent": "body", + "parent": "torso", "pivot": [5.1, 7.2, -4.25], "cubes": [ {"origin": [3.2, 6.7, -5.3], "size": [4, 1, 2], "inflate": -0.1, "uv": [0, 48]} @@ -301,6 +306,38 @@ {"origin": [9.1, 6.7, -5.2], "size": [2, 1, 0], "uv": [29, 29]} ] }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 4.2, 4.5], + "cubes": [ + {"origin": [-1.5, 2.7, 4.5], "size": [3, 3, 11], "inflate": 0.02, "uv": [1, 50]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 4.2, 15.5], + "cubes": [ + {"origin": [-1, 3.2, 15.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [37, 21]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 4.2, 20.3], + "cubes": [ + {"origin": [-1, 3.2, 20.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [16, 42]} + ] + }, + { + "name": "tail4", + "parent": "tail3", + "pivot": [0, 4.2, 25.3], + "cubes": [ + {"origin": [-0.5, 3.7, 25.3], "size": [1, 1, 5], "inflate": 0.02, "uv": [46, 24]} + ] + }, { "name": "foot_right", "parent": "body", @@ -340,38 +377,6 @@ {"origin": [3.55, 0, -6], "size": [0, 1, 3], "uv": [29, 20]}, {"origin": [2.3, 0, -6], "size": [0, 1, 3], "pivot": [2.3, 0.5, -3], "rotation": [0, 10, 0], "uv": [29, 22]} ] - }, - { - "name": "tail", - "parent": "body", - "pivot": [0, 4.2, 4.5], - "cubes": [ - {"origin": [-1.5, 2.7, 4.5], "size": [3, 3, 11], "inflate": 0.02, "uv": [1, 50]} - ] - }, - { - "name": "tail2", - "parent": "tail", - "pivot": [0, 4.2, 15.5], - "cubes": [ - {"origin": [-1, 3.2, 15.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [37, 21]} - ] - }, - { - "name": "tail3", - "parent": "tail2", - "pivot": [0, 4.2, 20.3], - "cubes": [ - {"origin": [-1, 3.2, 20.3], "size": [2, 2, 5], "inflate": 0.01, "uv": [16, 42]} - ] - }, - { - "name": "tail4", - "parent": "tail3", - "pivot": [0, 4.2, 25.3], - "cubes": [ - {"origin": [-0.5, 3.7, 25.3], "size": [1, 1, 5], "inflate": 0.02, "uv": [46, 24]} - ] } ] } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_male.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_male.geo.json index b680c1f469..9299ddd963 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_male.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0020_raticate/raticate_male.geo.json @@ -18,14 +18,19 @@ { "name": "body", "parent": "raticate", - "pivot": [0, 5.7, 0], + "pivot": [0, 5.7, 0] + }, + { + "name": "torso", + "parent": "body", + "pivot": [1, 5.7, -2], "cubes": [ {"origin": [-5.5, 1.2, -5.5], "size": [11, 10, 11], "uv": [0, 0]} ] }, { "name": "head", - "parent": "body", + "parent": "torso", "pivot": [0, 11.2, -0.2], "rotation": [10, 0, 0], "cubes": [ @@ -223,7 +228,7 @@ }, { "name": "arm_right", - "parent": "body", + "parent": "torso", "pivot": [-5.1, 7.2, -4.25], "cubes": [ {"origin": [-7.2, 6.7, -5.3], "size": [4, 1, 2], "inflate": -0.1, "uv": [0, 51]} @@ -263,7 +268,7 @@ }, { "name": "arm_left", - "parent": "body", + "parent": "torso", "pivot": [5.1, 7.2, -4.25], "cubes": [ {"origin": [3.2, 6.7, -5.3], "size": [4, 1, 2], "inflate": -0.1, "uv": [0, 48]} @@ -301,6 +306,38 @@ {"origin": [9.1, 6.7, -5.2], "size": [2, 1, 0], "uv": [29, 29]} ] }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 4.2, 4.5], + "cubes": [ + {"origin": [-1.5, 2.7, 4.5], "size": [3, 3, 11], "inflate": 0.02, "uv": [1, 50]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 4.2, 15.5], + "cubes": [ + {"origin": [-1, 3.2, 15.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [37, 21]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 4.2, 20.3], + "cubes": [ + {"origin": [-1, 3.2, 20.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [16, 42]} + ] + }, + { + "name": "tail4", + "parent": "tail3", + "pivot": [0, 4.2, 25.3], + "cubes": [ + {"origin": [-0.5, 3.7, 25.3], "size": [1, 1, 5], "inflate": 0.02, "uv": [46, 24]} + ] + }, { "name": "foot_right", "parent": "body", @@ -340,38 +377,6 @@ {"origin": [3.55, 0, -6], "size": [0, 1, 3], "uv": [29, 20]}, {"origin": [2.3, 0, -6], "size": [0, 1, 3], "pivot": [2.3, 0.5, -3], "rotation": [0, 10, 0], "uv": [29, 22]} ] - }, - { - "name": "tail", - "parent": "body", - "pivot": [0, 4.2, 4.5], - "cubes": [ - {"origin": [-1.5, 2.7, 4.5], "size": [3, 3, 11], "inflate": 0.02, "uv": [1, 50]} - ] - }, - { - "name": "tail2", - "parent": "tail", - "pivot": [0, 4.2, 15.5], - "cubes": [ - {"origin": [-1, 3.2, 15.3], "size": [2, 2, 5], "inflate": 0.02, "uv": [37, 21]} - ] - }, - { - "name": "tail3", - "parent": "tail2", - "pivot": [0, 4.2, 20.3], - "cubes": [ - {"origin": [-1, 3.2, 20.3], "size": [2, 2, 5], "inflate": 0.01, "uv": [16, 42]} - ] - }, - { - "name": "tail4", - "parent": "tail3", - "pivot": [0, 4.2, 25.3], - "cubes": [ - {"origin": [-0.5, 3.7, 25.3], "size": [1, 1, 5], "inflate": 0.02, "uv": [46, 24]} - ] } ] } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor.geo.json index bbc38ecf4c..7580858e4e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor.geo.json @@ -3,12 +3,12 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.exeggutor", - "texture_width": 128, - "texture_height": 64, - "visible_bounds_width": 5, - "visible_bounds_height": 3.5, - "visible_bounds_offset": [0, 1.25, 0] + "identifier": "geometry.exeggutor_alolan", + "texture_width": 256, + "texture_height": 128, + "visible_bounds_width": 7, + "visible_bounds_height": 9.5, + "visible_bounds_offset": [0, 4.25, 0] }, "bones": [ { @@ -18,675 +18,704 @@ { "name": "body", "parent": "exeggutor", - "pivot": [0, 1, 0] + "pivot": [0, 21, 0] }, { "name": "torso", "parent": "body", - "pivot": [0, 1, 0], + "pivot": [0, 15, 0], "cubes": [ - {"origin": [-5.5, 7, -5.5], "size": [11, 16, 11], "uv": [0, 0]} + {"origin": [-12, 12, -12], "size": [24, 25, 24], "uv": [0, 0]}, + {"origin": [-10, 37, -10], "size": [20, 11, 20], "uv": [0, 49]} ] }, { - "name": "head", + "name": "upperHead", "parent": "torso", - "pivot": [0, 21.5, -3.5], + "pivot": [0, -22.5, 0] + }, + { + "name": "head", + "parent": "upperHead", + "pivot": [0, 37.75, -6.5], "rotation": [-7.5, 0, 0], "cubes": [ - {"origin": [-3.5, 18, -10.5], "size": [7, 8, 7], "uv": [0, 42]} + {"origin": [-7, 31.25, -22.5], "size": [14, 16, 14], "uv": [82, 35]} ] }, { "name": "mouth_closed", "parent": "head", - "pivot": [0, 18.25, -4.5], + "pivot": [0, 28, -3.7], "cubes": [ - {"origin": [-2.5, 19.5, -10.41], "size": [5, 2, 0], "uv": [21, 42]} + {"origin": [-6.5, 32.75, -22.45], "size": [13, 6, 0], "inflate": 0.01, "uv": [96, 27]} ] }, { "name": "mouth_open", "parent": "head", - "pivot": [0, 20, -10.51], + "pivot": [0, 33.25, -21.53], "cubes": [ - {"origin": [-3, 19.5, -10.51], "size": [6, 2, 0], "uv": [21, 30]} + {"origin": [-6, 31.75, -22.51], "size": [12, 7, 0], "uv": [42, 87]} ] }, { - "name": "eye_left", + "name": "eye_right", "parent": "head", - "pivot": [2.01, 22.75, -10.01], + "pivot": [-4.53, 41.5, -20.03], "cubes": [ - {"origin": [0.51, 21.75, -10.51], "size": [3, 2, 1], "uv": [88, 19]} + {"origin": [-6.01, 39.5, -22.51], "size": [5, 5, 0], "uv": [40, 120]} ] }, { - "name": "eyelid_left", - "parent": "eye_left", - "pivot": [1.91, 22.75, -9.91], + "name": "eyelid_right", + "parent": "eye_right", + "pivot": [-4.45, 43, -20.95], "cubes": [ - {"origin": [0.41, 21.75, -10.41], "size": [3, 2, 1], "inflate": 0.01, "uv": [72, 32]} + {"origin": [-6.45, 39.5, -22.45], "size": [6, 5, 1], "inflate": 0.01, "uv": [224, 80]} ] }, { - "name": "eye_right", + "name": "eye_left", "parent": "head", - "pivot": [-2.01, 22.75, -10.01], + "pivot": [4.53, 41.5, -20.03], "cubes": [ - {"origin": [-3.51, 21.75, -10.51], "size": [3, 2, 1], "uv": [54, 42]} + {"origin": [1.01, 39.5, -22.51], "size": [5, 5, 0], "uv": [0, 110]} ] }, { - "name": "eyelid_right", - "parent": "eye_right", - "pivot": [-1.91, 22.75, -9.91], + "name": "eyelid_left", + "parent": "eye_left", + "pivot": [4.45, 43, -20.95], "cubes": [ - {"origin": [-3.41, 21.75, -10.41], "size": [3, 2, 1], "inflate": 0.01, "uv": [51, 3]} + {"origin": [0.45, 39.5, -22.45], "size": [6, 5, 1], "inflate": 0.01, "uv": [142, 91]} ] }, { "name": "head2", - "parent": "torso", - "pivot": [4, 21.5, -2], + "parent": "upperHead", + "pivot": [6, 39, -3], "rotation": [-7.5, -60, 0], "cubes": [ - {"origin": [0.5, 18, -9], "size": [7, 8, 7], "uv": [28, 27]} + {"origin": [-1, 32.5, -19], "size": [14, 16, 14], "uv": [0, 80]} ] }, { "name": "mouth_closed2", "parent": "head2", - "pivot": [4, 18.25, -2.9], + "pivot": [6, 27.25, 0], "cubes": [ - {"origin": [1.5, 20, -8.91], "size": [5, 2, 0], "uv": [33, 9]} + {"origin": [0, 33.5, -19.05], "size": [12, 6, 0], "inflate": 0.01, "uv": [80, 96]} ] }, { "name": "mouth_open2", "parent": "head2", - "pivot": [4, 20.75, -9.01], + "pivot": [6, 34.75, -17.93], "cubes": [ - {"origin": [2, 20, -9.01], "size": [4, 2, 0], "uv": [89, 23]} + {"origin": [1.5, 33.5, -18.91], "size": [9, 6, 0], "uv": [70, 117]} ] }, { - "name": "eye_left2", + "name": "eye_right2", "parent": "head2", - "pivot": [6.01, 22.5, -8.51], + "pivot": [1.47, 40, -16.53], "cubes": [ - {"origin": [4.51, 22.5, -9.01], "size": [3, 1, 1], "uv": [107, 49]} + {"origin": [-0.05, 41, -19.01], "size": [5, 4, 0], "uv": [116, 121]} ] }, { - "name": "eyelid_left2", - "parent": "eye_left2", - "pivot": [5.91, 22.5, -8.41], + "name": "eyelid_right2", + "parent": "eye_right2", + "pivot": [1.57, 40, -16.43], "cubes": [ - {"origin": [4.41, 22.5, -8.91], "size": [3, 1, 1], "inflate": 0.01, "uv": [96, 19]} + {"origin": [-0.45, 41, -18.95], "size": [6, 4, 1], "inflate": 0.01, "uv": [148, 40]} ] }, { - "name": "eye_right2", + "name": "eye_left2", "parent": "head2", - "pivot": [1.99, 22.5, -8.51], + "pivot": [10.53, 40, -16.53], "cubes": [ - {"origin": [0.49, 22.5, -9.01], "size": [3, 1, 1], "uv": [64, 22]} + {"origin": [7.05, 41, -19.01], "size": [5, 4, 0], "uv": [90, 102]} ] }, { - "name": "eyelid_right2", - "parent": "eye_right2", - "pivot": [2.09, 22.5, -8.41], + "name": "eyelid_left2", + "parent": "eye_left2", + "pivot": [10.43, 40, -16.43], "cubes": [ - {"origin": [0.59, 22.5, -8.91], "size": [3, 1, 1], "inflate": 0.01, "uv": [44, 22]} + {"origin": [6.45, 41, -18.95], "size": [6, 4, 1], "inflate": 0.01, "uv": [208, 38]} ] }, { "name": "head3", - "parent": "torso", - "pivot": [-4, 21.5, -2], + "parent": "upperHead", + "pivot": [-6, 39, -3], "rotation": [-7.5, 60, 0], "cubes": [ - {"origin": [-7.5, 18, -9], "size": [7, 8, 7], "uv": [0, 27]} + {"origin": [-13, 32.5, -18], "size": [14, 16, 14], "uv": [66, 66]} ] }, { "name": "mouth_closed3", "parent": "head3", - "pivot": [-4, 18.25, -3], + "pivot": [-6, 28.25, -0.2], "cubes": [ - {"origin": [-6.5, 19.5, -8.91], "size": [5, 2, 0], "uv": [21, 32]} + {"origin": [-12.5, 34, -17.95], "size": [13, 6, 0], "inflate": 0.01, "uv": [96, 21]} ] }, { "name": "mouth_open3", "parent": "head3", - "pivot": [-4, 20, -9.01], + "pivot": [-6, 34.5, -18.03], "cubes": [ - {"origin": [-7, 18.5, -9.01], "size": [6, 3, 0], "uv": [21, 27]} + {"origin": [-12, 33, -18.01], "size": [12, 7, 0], "uv": [42, 80]} ] }, { "name": "eye_left3", "parent": "head3", - "pivot": [-1.99, 22.75, -8.51], + "pivot": [-1.47, 41.75, -16.53], "cubes": [ - {"origin": [-3.49, 21.75, -9.01], "size": [3, 2, 1], "uv": [51, 0]} + {"origin": [-4.95, 40.25, -18.01], "size": [5, 5, 0], "uv": [116, 116]} ] }, { "name": "eyelid_left3", "parent": "eye_left3", - "pivot": [-2.09, 22.75, -8.41], + "pivot": [-1.57, 42.75, -16.43], "cubes": [ - {"origin": [-3.59, 21.75, -8.91], "size": [3, 2, 1], "inflate": 0.01, "uv": [46, 42]} + {"origin": [-5.55, 41.25, -17.91], "size": [6, 4, 1], "inflate": 0.01, "uv": [191, 81]} ] }, { "name": "eye_right3", "parent": "head3", - "pivot": [-6.01, 22.75, -8.51], + "pivot": [-10.53, 41.75, -16.53], "cubes": [ - {"origin": [-7.51, 21.75, -9.01], "size": [3, 2, 1], "uv": [21, 44]} + {"origin": [-12.01, 40.25, -18.01], "size": [5, 5, 0], "uv": [0, 115]} ] }, { "name": "eyelid_right3", "parent": "eye_right3", - "pivot": [-5.91, 22.85, -8.51], + "pivot": [-10.41, 42.75, -16.41], "cubes": [ - {"origin": [-7.41, 21.75, -8.91], "size": [3, 2, 1], "inflate": 0.01, "uv": [44, 19]} + {"origin": [-12.41, 41.25, -17.91], "size": [6, 4, 1], "inflate": 0.01, "uv": [144, 12]} ] }, { - "name": "leaves_inner", - "parent": "torso", - "pivot": [0, 22, 1.5], - "rotation": [0, 180, 0] + "name": "leaves_outer", + "parent": "upperHead", + "pivot": [0, -19.5, -3] }, { - "name": "leaf_set11", - "parent": "leaves_inner", - "pivot": [0, 23, 1.5] + "name": "leaf_set", + "parent": "leaves_outer", + "pivot": [0, 46.5, 1.5], + "rotation": [0, 15, 0] }, { - "name": "leaf31", - "parent": "leaf_set11", - "pivot": [0, 23, 0.5], - "rotation": [30, 0, 0], + "name": "leaf", + "parent": "leaf_set", + "pivot": [3, 46.5, -4.5], + "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-2, 23, 0.5], "size": [4, 8, 0], "uv": [67, 0]} + {"origin": [-4, 47.5, -4.5], "size": [8, 11, 0], "uv": [230, 109]} ] }, { - "name": "leaf32", - "parent": "leaf31", - "pivot": [0, 31, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf2", + "parent": "leaf", + "pivot": [3, 58.5, -4.5], + "rotation": [47.5, 0, 0], "cubes": [ - {"origin": [-2, 31, 0.5], "size": [4, 11, 0], "uv": [93, 29]} + {"origin": [-4, 58.5, -4.5], "size": [8, 20, 0], "uv": [208, 68]} ] }, { - "name": "leaf33", - "parent": "leaf32", - "pivot": [0, 42, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf3", + "parent": "leaf2", + "pivot": [3, 78.5, -4.5], + "rotation": [35, 0, 0], "cubes": [ - {"origin": [-1.5, 42, 0.5], "size": [3, 8, 0], "uv": [72, 24]} + {"origin": [-2.5, 78.5, -4.5], "size": [5, 11, 0], "uv": [246, 30]} ] }, { - "name": "leaf_set10", - "parent": "leaves_inner", - "pivot": [0, 23, 1.5], - "rotation": [0, 144, 0] + "name": "leaf_set13", + "parent": "leaves_outer", + "pivot": [0, 46.5, 1.5] }, { - "name": "leaf28", - "parent": "leaf_set10", - "pivot": [0, 23, 0.5], - "rotation": [22.5, 0, 0], + "name": "leaf37", + "parent": "leaf_set13", + "pivot": [3, 46.5, 2.5], + "rotation": [10, 0, 0], "cubes": [ - {"origin": [-2, 23, 0.5], "size": [4, 8, 0], "uv": [64, 28]} + {"origin": [-3, 47.5, 2.5], "size": [6, 6, 0], "uv": [148, 45]} ] }, { - "name": "leaf29", - "parent": "leaf28", - "pivot": [0, 31, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf38", + "parent": "leaf37", + "pivot": [3, 53.5, 2.5], + "rotation": [32.5, 0, 0], "cubes": [ - {"origin": [-2, 31, 0.5], "size": [4, 11, 0], "uv": [0, 0]} + {"origin": [-3, 53.5, 2.5], "size": [6, 15, 0], "uv": [108, 65]} ] }, { - "name": "leaf30", - "parent": "leaf29", - "pivot": [0, 42, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf39", + "parent": "leaf38", + "pivot": [3, 68.5, 2.5], + "rotation": [27.5, 0, 0], "cubes": [ - {"origin": [-1.5, 42, 0.5], "size": [3, 8, 0], "uv": [120, 31]} + {"origin": [-1.5, 68.5, 2.5], "size": [3, 6, 0], "uv": [16, 13]} ] }, { - "name": "leaf_set12", - "parent": "leaves_inner", - "pivot": [0, 23, 1.5], - "rotation": [0, -72, 0] + "name": "leaf_set6", + "parent": "leaves_outer", + "pivot": [0, 46.5, 1.5], + "rotation": [0, -15, 0] }, { - "name": "leaf34", - "parent": "leaf_set12", - "pivot": [0, 23, 0.5], - "rotation": [25, 0, 0], + "name": "leaf16", + "parent": "leaf_set6", + "pivot": [-3, 46.5, -4.5], + "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-2, 23, 0.5], "size": [4, 8, 0], "uv": [101, 37]} + {"origin": [-4, 47.5, -4.5], "size": [8, 11, 0], "uv": [136, 99]} ] }, { - "name": "leaf35", - "parent": "leaf34", - "pivot": [0, 31, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf17", + "parent": "leaf16", + "pivot": [-3, 58.5, -4.5], + "rotation": [47.5, 0, 0], "cubes": [ - {"origin": [-2, 31, 0.5], "size": [4, 11, 0], "uv": [85, 29]} + {"origin": [-4, 58.5, -4.5], "size": [8, 20, 0], "uv": [60, 49]} ] }, { - "name": "leaf36", - "parent": "leaf35", - "pivot": [0, 42, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf18", + "parent": "leaf17", + "pivot": [-3, 78.5, -4.5], + "rotation": [35, 0, 0], "cubes": [ - {"origin": [-1.5, 42, 0.5], "size": [3, 8, 0], "uv": [72, 16]} + {"origin": [-2.5, 78.5, -4.5], "size": [5, 11, 0], "uv": [144, 0]} ] }, { - "name": "leaf_set13", - "parent": "leaves_inner", - "pivot": [0, 23, 1.5], - "rotation": [0, -144, 0] + "name": "leaf_set2", + "parent": "leaves_outer", + "pivot": [0, 46.5, 1.5], + "rotation": [0, 47.5, 0] }, { - "name": "leaf37", - "parent": "leaf_set13", - "pivot": [0, 23, 0.5], - "rotation": [22.5, 0, 0], + "name": "leaf4", + "parent": "leaf_set2", + "pivot": [0, 46.5, -4.5], + "rotation": [27.5, 0, 0], "cubes": [ - {"origin": [-2, 23, 0.5], "size": [4, 8, 0], "uv": [101, 29]} + {"origin": [-4, 47.5, -4.5], "size": [8, 12, 0], "uv": [224, 26]} ] }, { - "name": "leaf38", - "parent": "leaf37", - "pivot": [0, 31, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf5", + "parent": "leaf4", + "pivot": [0, 59.5, -4.5], + "rotation": [52.5, 0, 0], "cubes": [ - {"origin": [-2, 31, 0.5], "size": [4, 11, 0], "uv": [56, 28]} + {"origin": [-4, 59.5, -4.5], "size": [8, 21, 0], "uv": [176, 20]} ] }, { - "name": "leaf39", - "parent": "leaf38", - "pivot": [0, 42, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf6", + "parent": "leaf5", + "pivot": [0, 80.5, -4.5], + "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-1.5, 42, 0.5], "size": [3, 8, 0], "uv": [72, 8]} + {"origin": [-2.5, 80.5, -4.5], "size": [5, 12, 0], "uv": [142, 79]} ] }, { - "name": "leaf_set9", - "parent": "leaves_inner", - "pivot": [0, 23, 1.5], - "rotation": [0, 72, 0] + "name": "leaf_set7", + "parent": "leaves_outer", + "pivot": [0, 46.5, 1.5], + "rotation": [0, -47.5, 0] }, { - "name": "leaf25", - "parent": "leaf_set9", - "pivot": [0, 23, 0.5], - "rotation": [25, 0, 0], + "name": "leaf19", + "parent": "leaf_set7", + "pivot": [0, 46.5, -4.5], + "rotation": [27.5, 0, 0], "cubes": [ - {"origin": [-2, 23, 0.5], "size": [4, 8, 0], "uv": [85, 40]} + {"origin": [-4, 47.5, -4.5], "size": [8, 12, 0], "uv": [224, 68]} ] }, { - "name": "leaf26", - "parent": "leaf25", - "pivot": [0, 31, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf20", + "parent": "leaf19", + "pivot": [0, 59.5, -4.5], + "rotation": [52.5, 0, 0], "cubes": [ - {"origin": [-2, 31, 0.5], "size": [4, 11, 0], "uv": [82, 0]} + {"origin": [-4, 59.5, -4.5], "size": [8, 21, 0], "uv": [228, 88]} ] }, { - "name": "leaf27", - "parent": "leaf26", - "pivot": [0, 42, 0.5], - "rotation": [42.5, 0, 0], + "name": "leaf21", + "parent": "leaf20", + "pivot": [0, 80.5, -4.5], + "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-1.5, 42, 0.5], "size": [3, 8, 0], "uv": [72, 52]} + {"origin": [-2.5, 80.5, -4.5], "size": [5, 12, 0], "uv": [138, 67]} ] }, { - "name": "leaves_outer", - "parent": "torso", - "pivot": [0, 1, 0] - }, - { - "name": "leaf_set", + "name": "leaf_set3", "parent": "leaves_outer", - "pivot": [0, 23, 1.5] + "pivot": [0, 46.5, 1.5], + "rotation": [0, 80, 0] }, { - "name": "leaf", - "parent": "leaf_set", - "pivot": [0, 23, -1.5], - "rotation": [22.5, 0, 0], + "name": "leaf7", + "parent": "leaf_set3", + "pivot": [0, 46.5, -4.5], + "rotation": [35, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [120, 11]} + {"origin": [-4, 47.5, -4.5], "size": [8, 13, 0], "uv": [112, 0]} ] }, { - "name": "leaf2", - "parent": "leaf", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf8", + "parent": "leaf7", + "pivot": [0, 60.5, -4.5], + "rotation": [47.5, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [64, 11]} + {"origin": [-4, 60.5, -4.5], "size": [8, 22, 0], "uv": [122, 65]} ] }, { - "name": "leaf3", - "parent": "leaf2", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf9", + "parent": "leaf8", + "pivot": [0, 82.5, -4.5], + "rotation": [35, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [82, 19]} + {"origin": [-2.5, 82.5, -4.5], "size": [5, 13, 0], "uv": [138, 42]} ] }, { - "name": "leaf_set2", + "name": "leaf_set8", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, 45, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, -80, 0] }, { - "name": "leaf4", - "parent": "leaf_set2", - "pivot": [0, 23, -1.5], - "rotation": [30, 0, 0], + "name": "leaf22", + "parent": "leaf_set8", + "pivot": [0, 46.5, -4.5], + "rotation": [35, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [106, 14]} + {"origin": [-4, 47.5, -4.5], "size": [8, 13, 0], "uv": [72, 0]} ] }, { - "name": "leaf5", - "parent": "leaf4", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf23", + "parent": "leaf22", + "pivot": [0, 60.5, -4.5], + "rotation": [47.5, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [62, 39]} + {"origin": [-4, 60.5, -4.5], "size": [8, 22, 0], "uv": [0, 0]} ] }, { - "name": "leaf6", - "parent": "leaf5", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf24", + "parent": "leaf23", + "pivot": [0, 82.5, -4.5], + "rotation": [35, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [95, 48]} + {"origin": [-2.5, 82.5, -4.5], "size": [5, 13, 0], "uv": [0, 80]} ] }, { - "name": "leaf_set3", + "name": "leaf_set4", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, 90, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, 112.5, 0] }, { - "name": "leaf7", - "parent": "leaf_set3", - "pivot": [0, 23, -1.5], - "rotation": [37.5, 0, 0], + "name": "leaf10", + "parent": "leaf_set4", + "pivot": [0, 46.5, -4.5], + "rotation": [30, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [90, 11]} + {"origin": [-4, 47.5, -4.5], "size": [8, 12, 0], "uv": [208, 26]} ] }, { - "name": "leaf8", - "parent": "leaf7", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf11", + "parent": "leaf10", + "pivot": [0, 59.5, -4.5], + "rotation": [45, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [120, 20]} + {"origin": [-4, 59.5, -4.5], "size": [8, 21, 0], "uv": [128, 0]} ] }, { - "name": "leaf9", - "parent": "leaf8", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf12", + "parent": "leaf11", + "pivot": [0, 80.5, -4.5], + "rotation": [32.5, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [89, 48]} + {"origin": [-2.5, 80.5, -4.5], "size": [5, 12, 0], "uv": [140, 21]} ] }, { - "name": "leaf_set4", + "name": "leaf_set9", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, 135, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, -112.5, 0] }, { - "name": "leaf10", - "parent": "leaf_set4", - "pivot": [0, 23, -1.5], - "rotation": [35, 0, 0], + "name": "leaf25", + "parent": "leaf_set9", + "pivot": [0, 46.5, -4.5], + "rotation": [30, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [70, 44]} + {"origin": [-4, 47.5, -4.5], "size": [8, 12, 0], "uv": [126, 87]} ] }, { - "name": "leaf11", - "parent": "leaf10", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf26", + "parent": "leaf25", + "pivot": [0, 59.5, -4.5], + "rotation": [45, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [120, 0]} + {"origin": [-4, 59.5, -4.5], "size": [8, 21, 0], "uv": [124, 21]} ] }, { - "name": "leaf12", - "parent": "leaf11", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf27", + "parent": "leaf26", + "pivot": [0, 80.5, -4.5], + "rotation": [32.5, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [83, 48]} + {"origin": [-2.5, 80.5, -4.5], "size": [5, 12, 0], "uv": [138, 55]} ] }, { "name": "leaf_set5", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, 180, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, 145, 0] }, { "name": "leaf13", "parent": "leaf_set5", - "pivot": [0, 23, -1.5], - "rotation": [40, 0, 0], + "pivot": [0, 46.5, -4.5], + "rotation": [45, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [70, 36]} + {"origin": [-4, 47.5, -4.5], "size": [8, 11, 0], "uv": [240, 70]} ] }, { "name": "leaf14", "parent": "leaf13", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "pivot": [0, 58.5, -4.5], + "rotation": [50, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [106, 3]} + {"origin": [-4, 58.5, -4.5], "size": [8, 20, 0], "uv": [192, 20]} ] }, { "name": "leaf15", "parent": "leaf14", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "pivot": [0, 78.5, -4.5], + "rotation": [40, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [75, 0]} + {"origin": [-2.5, 78.5, -4.5], "size": [5, 11, 0], "uv": [246, 106]} ] }, { - "name": "leaf_set6", + "name": "leaf_set11", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, -135, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, 170, 0] }, { - "name": "leaf16", - "parent": "leaf_set6", - "pivot": [0, 23, -1.5], - "rotation": [35, 0, 0], + "name": "leaf31", + "parent": "leaf_set11", + "pivot": [0, 46.5, -3.5], + "rotation": [45, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [98, 11]} + {"origin": [-2, 47.5, -3.5], "size": [4, 4, 0], "uv": [88, 117]} ] }, { - "name": "leaf17", - "parent": "leaf16", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf32", + "parent": "leaf31", + "pivot": [0, 51.5, -3.5], + "rotation": [50, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [59, 0]} + {"origin": [-2, 51.5, -3.5], "size": [4, 13, 0], "uv": [142, 110]} ] }, { - "name": "leaf18", - "parent": "leaf17", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf33", + "parent": "leaf32", + "pivot": [0, 64.5, -3.5], + "rotation": [40, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [109, 41]} + {"origin": [-1.5, 64.5, -3.5], "size": [3, 4, 0], "uv": [76, 53]} ] }, { - "name": "leaf_set7", + "name": "leaf_set12", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, -90, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, -170, 0] }, { - "name": "leaf19", - "parent": "leaf_set7", - "pivot": [0, 23, -1.5], - "rotation": [37.5, 0, 0], + "name": "leaf34", + "parent": "leaf_set12", + "pivot": [0, 46.5, -3.5], + "rotation": [45, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [82, 11]} + {"origin": [-2, 47.5, -3.5], "size": [4, 4, 0], "uv": [16, 19]} ] }, { - "name": "leaf20", - "parent": "leaf19", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf35", + "parent": "leaf34", + "pivot": [0, 51.5, -3.5], + "rotation": [50, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [98, 0]} + {"origin": [-2, 51.5, -3.5], "size": [4, 13, 0], "uv": [16, 0]} ] }, { - "name": "leaf21", - "parent": "leaf20", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf36", + "parent": "leaf35", + "pivot": [0, 64.5, -3.5], + "rotation": [40, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [101, 45]} + {"origin": [-1.5, 64.5, -3.5], "size": [3, 4, 0], "uv": [76, 49]} ] }, { - "name": "leaf_set8", + "name": "leaf_set10", "parent": "leaves_outer", - "pivot": [0, 23, 1.5], - "rotation": [0, -45, 0] + "pivot": [0, 46.5, 1.5], + "rotation": [0, -145, 0] }, { - "name": "leaf22", - "parent": "leaf_set8", - "pivot": [0, 23, -1.5], - "rotation": [30, 0, 0], + "name": "leaf28", + "parent": "leaf_set10", + "pivot": [0, 46.5, -4.5], + "rotation": [45, 0, 0], "cubes": [ - {"origin": [-2, 23, -1.5], "size": [4, 8, 0], "uv": [93, 40]} + {"origin": [-4, 47.5, -4.5], "size": [8, 11, 0], "uv": [192, 69]} ] }, { - "name": "leaf23", - "parent": "leaf22", - "pivot": [0, 31, -1.5], - "rotation": [55, 0, 0], + "name": "leaf29", + "parent": "leaf28", + "pivot": [0, 58.5, -4.5], + "rotation": [50, 0, 0], "cubes": [ - {"origin": [-2, 31, -1.5], "size": [4, 11, 0], "uv": [90, 0]} + {"origin": [-4, 58.5, -4.5], "size": [8, 20, 0], "uv": [0, 49]} ] }, { - "name": "leaf24", - "parent": "leaf23", - "pivot": [0, 42, -1.5], - "rotation": [42.5, 0, 0], + "name": "leaf30", + "parent": "leaf29", + "pivot": [0, 78.5, -4.5], + "rotation": [40, 0, 0], "cubes": [ - {"origin": [-1.5, 42, -1.5], "size": [3, 8, 0], "uv": [109, 33]} + {"origin": [-2.5, 78.5, -4.5], "size": [5, 11, 0], "uv": [244, 95]} ] }, { - "name": "leg_left", + "name": "leg_right", "parent": "body", - "pivot": [4.5, 8.5, 0], + "pivot": [-9, 18.5, 0], "cubes": [ - {"origin": [2, 6, -2.5], "size": [5, 5, 5], "inflate": 0.001, "uv": [47, 46]} + {"origin": [-14, 11, -5], "size": [10, 10, 10], "uv": [176, 0]} ] }, { - "name": "leg_left2", - "parent": "leg_left", - "pivot": [4.5, 6, -2.5], + "name": "leg_right2", + "parent": "leg_right", + "pivot": [-9, 11, -6.5], "cubes": [ - {"origin": [2, 2, -2.5], "size": [5, 4, 5], "uv": [28, 51]} + {"origin": [-14, 2, -5], "size": [10, 9, 10], "inflate": 0.02, "uv": [216, 7]} ] }, { - "name": "foot_left", - "parent": "leg_left2", - "pivot": [4.5, 2.25, 0.5], + "name": "foot_right", + "parent": "leg_right2", + "pivot": [-9, 4.75, 1.5], "cubes": [ - {"origin": [1.5, 0, -3.25], "size": [6, 3, 6], "uv": [28, 42]}, - {"origin": [3.25, 0, -5.25], "size": [0, 2, 2], "uv": [31, 30]}, - {"origin": [5.75, 0, -5.25], "size": [0, 2, 2], "uv": [0, 29]} + {"origin": [-15, 0, -9.75], "size": [12, 5, 16], "uv": [40, 96]} ] }, { - "name": "leg_right", + "name": "toe_right", + "parent": "foot_right", + "pivot": [-5, 4, -9.75], + "cubes": [ + {"origin": [-6.5, 0, -13.75], "size": [3, 3, 4], "uv": [140, 33]} + ] + }, + { + "name": "toe_right2", + "parent": "foot_right", + "pivot": [-13, 4, -9.75], + "cubes": [ + {"origin": [-14.5, 0, -13.75], "size": [3, 3, 4], "uv": [124, 42]} + ] + }, + { + "name": "leg_left", "parent": "body", - "pivot": [-4.5, 8.5, 0], + "pivot": [9, 18.5, 0], "cubes": [ - {"origin": [-7, 6, -2.5], "size": [5, 5, 5], "inflate": 0.001, "uv": [44, 9]} + {"origin": [4, 11, -5], "size": [10, 10, 10], "uv": [96, 96]} ] }, { - "name": "leg_right2", - "parent": "leg_right", - "pivot": [-4.5, 6, -2.5], + "name": "leg_left2", + "parent": "leg_left", + "pivot": [9, 11, -6.5], "cubes": [ - {"origin": [-7, 2, -2.5], "size": [5, 4, 5], "uv": [49, 19]} + {"origin": [4, 2, -5], "size": [10, 9, 10], "inflate": 0.02, "uv": [214, 49]} ] }, { - "name": "foot_right", - "parent": "leg_right2", - "pivot": [-4.5, 2.25, 0.5], + "name": "foot_left", + "parent": "leg_left2", + "pivot": [9, 4.75, 1.5], + "cubes": [ + {"origin": [3, 0, -9.75], "size": [12, 5, 16], "uv": [72, 0]} + ] + }, + { + "name": "toe_left", + "parent": "foot_left", + "pivot": [5, 4, -9.75], + "cubes": [ + {"origin": [3.5, 0, -13.75], "size": [3, 3, 4], "uv": [30, 113]} + ] + }, + { + "name": "toe_left2", + "parent": "foot_left", + "pivot": [13, 4, -9.75], "cubes": [ - {"origin": [-7.5, 0, -3.25], "size": [6, 3, 6], "uv": [33, 0]}, - {"origin": [-3.25, 0, -5.25], "size": [0, 2, 2], "uv": [0, 27]}, - {"origin": [-5.75, 0, -5.25], "size": [0, 2, 2], "uv": [0, 25]} + {"origin": [11.5, 0, -13.75], "size": [3, 3, 4], "uv": [80, 102]} ] } ] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json index df09aaa2f6..8e967b7347 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json @@ -4,11 +4,11 @@ { "description": { "identifier": "geometry.exeggutor_alolan", - "texture_width": 128, - "texture_height": 128, - "visible_bounds_width": 5, - "visible_bounds_height": 9.5, - "visible_bounds_offset": [0, 4.25, 0] + "texture_width": 256, + "texture_height": 256, + "visible_bounds_width": 12, + "visible_bounds_height": 20.5, + "visible_bounds_offset": [0, 9.75, 0] }, "bones": [ { @@ -18,886 +18,914 @@ { "name": "body", "parent": "exeggutor", - "pivot": [0, 1, 0] + "pivot": [0, -1, 0] }, { "name": "torso", "parent": "body", - "pivot": [0, 1, 0], + "pivot": [0, 18, 0], "cubes": [ - {"origin": [-5.5, 7, -5.5], "size": [11, 11, 11], "uv": [0, 0]}, - {"origin": [-4, 18, -4], "size": [8, 5, 8], "uv": [0, 104]} + {"origin": [-12.5, 15, -12.5], "size": [25, 27, 25], "uv": [0, 0]}, + {"origin": [-9, 42, -9], "size": [18, 9, 18], "uv": [54, 87]} ] }, { "name": "tail", "parent": "torso", - "pivot": [0, 10.5, 4.5], + "pivot": [0, 20.5, 9.5], "cubes": [ - {"origin": [-2.5, 8, 3.5], "size": [5, 5, 8], "uv": [0, 49]} + {"origin": [-6.5, 14, 5.5], "size": [13, 13, 22], "uv": [72, 52]} ] }, { "name": "tail2", "parent": "tail", - "pivot": [0, 10.5, 10.5], + "pivot": [0, 20.5, 25.5], "cubes": [ - {"origin": [-2, 8.5, 9.5], "size": [4, 4, 7], "uv": [68, 8]} + {"origin": [-5, 15.5, 22.5], "size": [10, 10, 19], "uv": [41, 114]} ] }, { "name": "tail3", "parent": "tail2", - "pivot": [0, 10.5, 15.5], + "pivot": [0, 20.5, 38.5], "cubes": [ - {"origin": [-1.5, 9, 14.5], "size": [3, 3, 7], "uv": [67, 81]} + {"origin": [-3.5, 17, 35.5], "size": [7, 7, 19], "uv": [123, 68]} ] }, { "name": "tail4", "parent": "tail3", - "pivot": [0, 10.5, 20.5], + "pivot": [0, 20.5, 51.5], "cubes": [ - {"origin": [-1, 9.5, 19.5], "size": [2, 2, 7], "uv": [83, 32]} + {"origin": [-2, 18.5, 48.5], "size": [4, 4, 19], "uv": [153, 44]} ] }, { "name": "tail5", "parent": "tail4", - "pivot": [0, 10.25, 27], + "pivot": [0, 19.75, 67.5], "cubes": [ - {"origin": [-2.5, 3.25, 24.5], "size": [5, 7, 5], "uv": [0, 80]}, - {"origin": [-1, 6.25, 29], "size": [2, 1, 3], "uv": [40, 2]} + {"origin": [-6.5, 3.75, 62], "size": [13, 16, 13], "uv": [120, 34]}, + {"origin": [-2.5, 10.75, 72.5], "size": [5, 2, 8], "uv": [45, 95]} ] }, { "name": "tail_eye_left", "parent": "tail5", - "pivot": [-0.5, 2, 29], + "pivot": [5, 12, 75.01], "cubes": [ - {"origin": [1.25, 6.5, 29.51], "size": [1, 1, 0], "uv": [8, 1]} + {"origin": [4, 11, 75.01], "size": [2, 2, 0], "uv": [20, 2]} ] }, { "name": "tail_eyelid_left", "parent": "tail_eye_left", - "pivot": [1.75, 7, 29.41], + "pivot": [5, 12, 74.93], "cubes": [ - {"origin": [1.25, 6.5, 28.41], "size": [1, 1, 1], "inflate": 0.01, "uv": [98, 2]} + {"origin": [4, 11, 73.95], "size": [2, 2, 1], "inflate": 0.01, "uv": [72, 71]} ] }, { "name": "tail_eye_right", "parent": "tail5", - "pivot": [0.5, 2, 29], + "pivot": [-5, 12, 75.01], "cubes": [ - {"origin": [-2.25, 6.5, 29.51], "size": [1, 1, 0], "uv": [8, 0]} + {"origin": [-6, 11, 75.01], "size": [2, 2, 0], "uv": [20, 0]} ] }, { "name": "tail_eyelid_right", "parent": "tail_eye_right", - "pivot": [-1.75, 7, 29.41], + "pivot": [-5, 12, 74.45], "cubes": [ - {"origin": [-2.25, 6.5, 28.41], "size": [1, 1, 1], "inflate": 0.01, "uv": [98, 0]} + {"origin": [-6, 11, 73.95], "size": [2, 2, 1], "inflate": 0.01, "uv": [64, 66]} ] }, { "name": "tail_jaw", "parent": "tail5", - "pivot": [0, 6.25, 29.5], + "pivot": [0, 10.75, 75], "cubes": [ - {"origin": [-1, 5.25, 29], "size": [2, 1, 3], "uv": [33, 5]} + {"origin": [-2.5, 8.75, 72.5], "size": [5, 2, 7], "uv": [123, 133]} ] }, { "name": "tail_leaf_right", "parent": "tail5", - "pivot": [0, 10.25, 27], + "pivot": [0, 19.75, 67.5], "rotation": [0, 0, 37.5], "cubes": [ - {"origin": [-5, 10.25, 25.5], "size": [5, 0, 3], "uv": [30, 0]} + {"origin": [-11, 19.75, 64], "size": [11, 0, 7], "uv": [47, 59]} ] }, { "name": "tail_leaf_right2", "parent": "tail_leaf_right", - "pivot": [-5, 10.25, 27], + "pivot": [-11, 19.75, 67.5], "rotation": [0, 0, -57.5], "cubes": [ - {"origin": [-10, 10.25, 26], "size": [5, 0, 2], "uv": [31, 3]} + {"origin": [-22, 19.75, 65], "size": [11, 0, 5], "uv": [95, 34]} ] }, { "name": "tail_leaf_left", "parent": "tail5", - "pivot": [0, 10.25, 27], + "pivot": [0, 19.75, 67.5], "rotation": [0, 0, -37.5], "cubes": [ - {"origin": [0, 10.25, 25.5], "size": [5, 0, 3], "uv": [21, 27]} + {"origin": [0, 19.75, 64], "size": [11, 0, 7], "uv": [47, 52]} ] }, { "name": "tail_leaf_left2", "parent": "tail_leaf_left", - "pivot": [5, 10.25, 27], + "pivot": [11, 19.75, 67.5], "rotation": [0, 0, 57.5], "cubes": [ - {"origin": [5, 10.25, 26], "size": [5, 0, 2], "uv": [22, 30]} + {"origin": [11, 19.75, 65], "size": [11, 0, 5], "uv": [67, 66]} ] }, { "name": "neck", "parent": "torso", - "pivot": [0, 22, 0], + "pivot": [0, 49, 0], "cubes": [ - {"origin": [-2.5, 21, -2.5], "size": [5, 10, 5], "inflate": 0.01, "uv": [53, 15]} + {"origin": [-4.5, 46, -4.5], "size": [9, 25, 9], "inflate": 0.02, "uv": [47, 145]} ] }, { "name": "neck2", "parent": "neck", - "pivot": [0, 30.5, 0], + "pivot": [0, 69.5, 0], "cubes": [ - {"origin": [-2.5, 30, -2.5], "size": [5, 9, 5], "uv": [15, 71]} + {"origin": [-4.5, 69, -4.5], "size": [9, 22, 9], "uv": [27, 179]} ] }, { "name": "neck3", "parent": "neck2", - "pivot": [0, 38.5, 0], + "pivot": [0, 89.5, 0], "cubes": [ - {"origin": [-2.5, 38, -2.5], "size": [5, 9, 5], "inflate": 0.01, "uv": [70, 46]} + {"origin": [-4.5, 89, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [0, 154]} ] }, { "name": "neck4", "parent": "neck3", - "pivot": [0, 46.5, 0], + "pivot": [0, 109.5, 0], "cubes": [ - {"origin": [-2.5, 46, -2.5], "size": [5, 9, 5], "uv": [70, 25]} + {"origin": [-4.5, 109, -4.5], "size": [9, 22, 9], "uv": [175, 116]} ] }, { "name": "neck5", "parent": "neck4", - "pivot": [0, 54.5, 0], + "pivot": [0, 129.5, 0], "cubes": [ - {"origin": [-2.5, 54, -2.5], "size": [5, 9, 5], "inflate": 0.01, "uv": [36, 69]} + {"origin": [-4.5, 129, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [119, 173]} ] }, { "name": "neck6", "parent": "neck5", - "pivot": [0, 62.5, 0], + "pivot": [0, 149.5, 0], "cubes": [ - {"origin": [-2.5, 62, -2.5], "size": [5, 9, 5], "uv": [63, 64]} + {"origin": [-4.5, 149, -4.5], "size": [9, 22, 9], "uv": [171, 85]} ] }, { "name": "neck7", "parent": "neck6", - "pivot": [0, 71, 0], + "pivot": [0, 171, 0], "cubes": [ - {"origin": [-2.5, 70, -2.5], "size": [5, 9, 5], "inflate": 0.01, "uv": [0, 62]} + {"origin": [-4.5, 169, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [166, 164]} ] }, { "name": "neck8", "parent": "neck7", - "pivot": [0, 78.5, 0], + "pivot": [0, 189.5, 0], "cubes": [ - {"origin": [-2.5, 78, -2.5], "size": [5, 9, 5], "uv": [21, 57]} + {"origin": [-4.5, 189, -4.5], "size": [9, 22, 9], "uv": [160, 0]} ] }, { "name": "neck9", "parent": "neck8", - "pivot": [0, 86.5, 0], + "pivot": [0, 209.5, 0], "cubes": [ - {"origin": [-2.5, 86, -2.5], "size": [5, 9, 5], "inflate": 0.01, "uv": [55, 37]} + {"origin": [-4.5, 209, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [83, 154]} ] }, { "name": "neck10", "parent": "neck9", - "pivot": [0, 94.5, 0], + "pivot": [0, 229.5, 0], "cubes": [ - {"origin": [-2.5, 94, -2.5], "size": [5, 12, 5], "uv": [48, 52]} + {"origin": [-4.5, 229, -4.5], "size": [9, 31, 9], "uv": [139, 133]} ] }, { "name": "neck11", "parent": "neck10", - "pivot": [0, 107.5, 0], + "pivot": [0, 261.5, 0], "cubes": [ - {"origin": [-4, 105, -4], "size": [8, 11, 8], "uv": [0, 27]} + {"origin": [-9, 258, -9], "size": [18, 25, 18], "uv": [0, 52]} ] }, { "name": "upperHead", "parent": "neck11", - "pivot": [0, 91.5, 0] + "pivot": [0, 212.5, 0] }, { "name": "head", "parent": "upperHead", - "pivot": [0, 112, -3.5], + "pivot": [0, 272, -8.5], "rotation": [-7.5, 0, 0], "cubes": [ - {"origin": [-3.5, 108.5, -10.5], "size": [7, 8, 7], "uv": [44, 0]} + {"origin": [-7.5, 265, -23.5], "size": [15, 19, 15], "uv": [111, 99]} ] }, { "name": "mouth_closed", "parent": "head", - "pivot": [0, 108.75, -4.5], + "pivot": [0, 262.25, -5.7], "cubes": [ - {"origin": [-2.5, 110, -10.41], "size": [5, 2, 0], "uv": [53, 30]} + {"origin": [-7.5, 267, -23.45], "size": [15, 6, 0], "inflate": 0.02, "uv": [159, 34]} ] }, { "name": "mouth_open", "parent": "head", - "pivot": [0, 110.5, -10.51], + "pivot": [0, 267.5, -23.53], "cubes": [ - {"origin": [-3, 110, -10.51], "size": [6, 2, 0], "uv": [24, 32]} + {"origin": [-7, 266, -23.51], "size": [14, 7, 0], "inflate": 0.02, "uv": [216, 0]} ] }, { - "name": "eye_left", + "name": "eye_right", "parent": "head", - "pivot": [2.01, 113.25, -10.01], + "pivot": [-5.03, 275.75, -22.03], "cubes": [ - {"origin": [0.51, 112.25, -10.51], "size": [3, 3, 1], "uv": [60, 32]} + {"origin": [-6.51, 273.75, -23.51], "size": [5, 8, 0], "inflate": 0.02, "uv": [100, 122]} ] }, { - "name": "eyelid_left", - "parent": "eye_left", - "pivot": [1.91, 113.25, -9.91], + "name": "eyelid_right", + "parent": "eye_right", + "pivot": [-4.95, 277.25, -22.95], "cubes": [ - {"origin": [0.41, 112.25, -10.41], "size": [3, 3, 1], "inflate": 0.01, "uv": [103, 4]} + {"origin": [-6.95, 273.75, -23.45], "size": [6, 8, 1], "inflate": 0.04, "uv": [180, 52]} ] }, { - "name": "eye_right", + "name": "eye_left", "parent": "head", - "pivot": [-2.01, 113.25, -10.01], + "pivot": [5.03, 275.75, -22.03], "cubes": [ - {"origin": [-3.51, 112.25, -10.51], "size": [3, 3, 1], "uv": [46, 42]} + {"origin": [1.51, 273.75, -23.51], "size": [5, 8, 0], "inflate": 0.02, "uv": [100, 114]} ] }, { - "name": "eyelid_right", - "parent": "eye_right", - "pivot": [-1.91, 113.25, -9.91], + "name": "eyelid_left", + "parent": "eye_left", + "pivot": [4.95, 277.25, -22.95], "cubes": [ - {"origin": [-3.41, 112.25, -10.41], "size": [3, 3, 1], "inflate": 0.01, "uv": [103, 0]} + {"origin": [0.95, 273.75, -23.45], "size": [6, 8, 1], "inflate": 0.04, "uv": [146, 173]} ] }, { "name": "head2", "parent": "upperHead", - "pivot": [4, 112, -2], + "pivot": [9, 271, -4], "rotation": [-7.5, -60, 0], "cubes": [ - {"origin": [0.5, 108.5, -9], "size": [7, 8, 7], "uv": [25, 42]} + {"origin": [1.5, 264, -19], "size": [15, 19, 15], "uv": [100, 0]} ] }, { "name": "mouth_closed2", "parent": "head2", - "pivot": [4, 108.75, -2.9], + "pivot": [9, 260.25, -1], "cubes": [ - {"origin": [1.5, 110.5, -8.91], "size": [5, 2, 0], "uv": [20, 46]} + {"origin": [2, 266.5, -19.05], "size": [14, 6, 0], "inflate": 0.02, "uv": [54, 179]} ] }, { "name": "mouth_open2", "parent": "head2", - "pivot": [4, 111.25, -9.01], + "pivot": [9, 267.75, -18.93], "cubes": [ - {"origin": [2, 110.5, -9.01], "size": [4, 2, 0], "uv": [0, 76]} + {"origin": [3.5, 266.5, -18.91], "size": [11, 6, 0], "inflate": 0.02, "uv": [120, 63]} ] }, { - "name": "eye_left2", + "name": "eye_right2", "parent": "head2", - "pivot": [6.01, 113, -8.51], + "pivot": [3.97, 273, -17.53], "cubes": [ - {"origin": [4.51, 113, -9.01], "size": [3, 1, 1], "uv": [75, 62]} + {"origin": [2.45, 274, -19.01], "size": [5, 4, 0], "inflate": 0.02, "uv": [14, 95]} ] }, { - "name": "eyelid_left2", - "parent": "eye_left2", - "pivot": [5.91, 113, -8.41], + "name": "eyelid_right2", + "parent": "eye_right2", + "pivot": [4.07, 273, -17.43], "cubes": [ - {"origin": [4.41, 113, -8.91], "size": [3, 1, 1], "inflate": 0.01, "uv": [75, 44]} + {"origin": [2.05, 274, -18.95], "size": [6, 4, 1], "inflate": 0.04, "uv": [120, 69]} ] }, { - "name": "eye_right2", + "name": "eye_left2", "parent": "head2", - "pivot": [1.99, 113, -8.51], + "pivot": [14.03, 273, -17.53], "cubes": [ - {"origin": [0.49, 113, -9.01], "size": [3, 1, 1], "uv": [75, 42]} + {"origin": [10.55, 274, -19.01], "size": [5, 4, 0], "inflate": 0.02, "uv": [54, 66]} ] }, { - "name": "eyelid_right2", - "parent": "eye_right2", - "pivot": [2.09, 113, -8.41], + "name": "eyelid_left2", + "parent": "eye_left2", + "pivot": [13.93, 273, -17.43], "cubes": [ - {"origin": [0.59, 113, -8.91], "size": [3, 1, 1], "inflate": 0.01, "uv": [43, 0]} + {"origin": [9.95, 274, -18.95], "size": [6, 4, 1], "inflate": 0.04, "uv": [76, 61]} ] }, { "name": "head3", "parent": "upperHead", - "pivot": [-4, 112, -2], + "pivot": [-9, 271, -4], "rotation": [-7.5, 60, 0], "cubes": [ - {"origin": [-7.5, 108.5, -9], "size": [7, 8, 7], "uv": [32, 27]} + {"origin": [-16.5, 264, -19], "size": [15, 19, 15], "uv": [0, 99]} ] }, { "name": "mouth_closed3", "parent": "head3", - "pivot": [-4, 108.75, -3], + "pivot": [-9, 261.25, -1.2], "cubes": [ - {"origin": [-6.5, 110, -8.91], "size": [5, 2, 0], "uv": [33, 9]} + {"origin": [-16.5, 267, -18.95], "size": [15, 6, 0], "inflate": 0.02, "uv": [100, 39]} ] }, { "name": "mouth_open3", "parent": "head3", - "pivot": [-4, 110.5, -9.01], + "pivot": [-9, 267.5, -19.03], "cubes": [ - {"origin": [-7, 109, -9.01], "size": [6, 3, 0], "uv": [8, 46]} + {"origin": [-16, 266, -19.01], "size": [14, 7, 0], "inflate": 0.02, "uv": [176, 77]} ] }, { "name": "eye_left3", "parent": "head3", - "pivot": [-1.99, 113.25, -8.51], + "pivot": [-3.97, 274.75, -17.53], "cubes": [ - {"origin": [-3.49, 112.25, -9.01], "size": [3, 2, 1], "uv": [30, 71]} + {"origin": [-7.45, 273.25, -19.01], "size": [5, 5, 0], "inflate": 0.02, "uv": [122, 94]} ] }, { "name": "eyelid_left3", "parent": "eye_left3", - "pivot": [-2.09, 113.25, -8.41], + "pivot": [-4.07, 274.75, -17.43], "cubes": [ - {"origin": [-3.59, 112.25, -8.91], "size": [3, 2, 1], "inflate": 0.01, "uv": [70, 39]} + {"origin": [-8.05, 273.25, -18.91], "size": [6, 5, 1], "inflate": 0.04, "uv": [100, 45]} ] }, { "name": "eye_right3", "parent": "head3", - "pivot": [-6.01, 113.25, -8.51], + "pivot": [-14.03, 274.75, -17.53], "cubes": [ - {"origin": [-7.51, 112.25, -9.01], "size": [3, 2, 1], "uv": [68, 60]} + {"origin": [-15.51, 273.25, -19.01], "size": [5, 5, 0], "inflate": 0.02, "uv": [122, 34]} ] }, { "name": "eyelid_right3", "parent": "eye_right3", - "pivot": [-5.91, 113.35, -8.51], + "pivot": [-13.91, 274.75, -17.41], "cubes": [ - {"origin": [-7.41, 112.25, -8.91], "size": [3, 2, 1], "inflate": 0.01, "uv": [46, 46]} + {"origin": [-15.91, 273.25, -18.91], "size": [6, 5, 1], "inflate": 0.04, "uv": [95, 9]} ] }, { "name": "leaves_inner", "parent": "upperHead", - "pivot": [0, 113.5, -0.5], + "pivot": [0, 278.5, -1.5], "rotation": [0, 180, 0] }, { "name": "leaf_set11", "parent": "leaves_inner", - "pivot": [0, 114.5, -0.5] + "pivot": [0, 281.5, 0.5] }, { "name": "leaf31", "parent": "leaf_set11", - "pivot": [0, 114.5, -1.5], + "pivot": [0, 281.5, -2.5], "rotation": [30, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -1.5], "size": [4, 8, 0], "uv": [90, 52]} + {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [207, 102]} ] }, { "name": "leaf32", "parent": "leaf31", - "pivot": [0, 122.5, -1.5], + "pivot": [0, 298.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -1.5], "size": [4, 11, 0], "uv": [50, 87]} + {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [155, 195]} ] }, { "name": "leaf33", "parent": "leaf32", - "pivot": [0, 133.5, -1.5], + "pivot": [0, 323.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -1.5], "size": [3, 8, 0], "uv": [44, 93]} + {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [0, 133]} ] }, { "name": "leaf_set10", "parent": "leaves_inner", - "pivot": [0, 114.5, -0.5], + "pivot": [0, 281.5, -1.5], "rotation": [0, 144, 0] }, { "name": "leaf28", "parent": "leaf_set10", - "pivot": [0, 114.5, -1.5], + "pivot": [0, 281.5, -2.5], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -1.5], "size": [4, 8, 0], "uv": [0, 27]} + {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [80, 114]} ] }, { "name": "leaf29", "parent": "leaf28", - "pivot": [0, 122.5, -1.5], + "pivot": [0, 298.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -1.5], "size": [4, 11, 0], "uv": [44, 15]} + {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [75, 0]} ] }, { "name": "leaf30", "parent": "leaf29", - "pivot": [0, 133.5, -1.5], + "pivot": [0, 323.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -1.5], "size": [3, 8, 0], "uv": [18, 49]} + {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [0, 52]} ] }, { "name": "leaf_set12", "parent": "leaves_inner", - "pivot": [0, 114.5, -0.5], + "pivot": [0, 281.5, -1.5], "rotation": [0, -72, 0] }, { "name": "leaf34", "parent": "leaf_set12", - "pivot": [0, 114.5, -1.5], + "pivot": [0, 281.5, -2.5], "rotation": [25, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -1.5], "size": [4, 8, 0], "uv": [90, 23]} + {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [156, 67]} ] }, { "name": "leaf35", "parent": "leaf34", - "pivot": [0, 122.5, -1.5], + "pivot": [0, 298.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -1.5], "size": [4, 11, 0], "uv": [20, 85]} + {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [193, 147]} ] }, { "name": "leaf36", "parent": "leaf35", - "pivot": [0, 133.5, -1.5], + "pivot": [0, 323.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -1.5], "size": [3, 8, 0], "uv": [56, 69]} + {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [108, 87]} ] }, { "name": "leaf_set13", "parent": "leaves_inner", - "pivot": [0, 114.5, -0.5], + "pivot": [0, 281.5, -1.5], "rotation": [0, -144, 0] }, { "name": "leaf37", "parent": "leaf_set13", - "pivot": [0, 114.5, -1.5], + "pivot": [0, 281.5, -2.5], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -1.5], "size": [4, 8, 0], "uv": [72, 0]} + {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [119, 154]} ] }, { "name": "leaf38", "parent": "leaf37", - "pivot": [0, 122.5, -1.5], + "pivot": [0, 298.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -1.5], "size": [4, 11, 0], "uv": [0, 46]} + {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [0, 185]} ] }, { "name": "leaf39", "parent": "leaf38", - "pivot": [0, 133.5, -1.5], + "pivot": [0, 323.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -1.5], "size": [3, 8, 0], "uv": [41, 57]} + {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [0, 95]} ] }, { "name": "leaf_set9", "parent": "leaves_inner", - "pivot": [0, 114.5, -0.5], + "pivot": [0, 281.5, -1.5], "rotation": [0, 72, 0] }, { "name": "leaf25", "parent": "leaf_set9", - "pivot": [0, 114.5, -1.5], + "pivot": [0, 281.5, -2.5], "rotation": [25, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -1.5], "size": [4, 8, 0], "uv": [90, 92]} + {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [0, 210]} ] }, { "name": "leaf26", "parent": "leaf25", - "pivot": [0, 122.5, -1.5], + "pivot": [0, 298.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -1.5], "size": [4, 11, 0], "uv": [58, 87]} + {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [196, 0]} ] }, { "name": "leaf27", "parent": "leaf26", - "pivot": [0, 133.5, -1.5], + "pivot": [0, 323.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -1.5], "size": [3, 8, 0], "uv": [98, 49]} + {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [156, 94]} ] }, { "name": "leaves_outer", "parent": "upperHead", - "pivot": [0, 92.5, -1.5] + "pivot": [0, 215.5, -4.5] }, { "name": "leaf_set", "parent": "leaves_outer", - "pivot": [0, 114.5, 0] + "pivot": [0, 281.5, 0] }, { "name": "leaf", "parent": "leaf_set", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [98, 41]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [215, 205]} ] }, { "name": "leaf2", "parent": "leaf", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [82, 92]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [207, 77]} ] }, { "name": "leaf3", "parent": "leaf2", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [24, 101]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [0, 226]} ] }, { "name": "leaf_set2", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, 45, 0] }, { "name": "leaf4", "parent": "leaf_set2", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [30, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [98, 23]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [213, 166]} ] }, { "name": "leaf5", "parent": "leaf4", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [8, 92]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [83, 206]} ] }, { "name": "leaf6", "parent": "leaf5", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [90, 100]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [215, 221]} ] }, { "name": "leaf_set3", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, 90, 0] }, { "name": "leaf7", "parent": "leaf_set3", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [94, 31]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [40, 210]} ] }, { "name": "leaf8", "parent": "leaf7", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [0, 92]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [63, 206]} ] }, { "name": "leaf9", "parent": "leaf8", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [100, 10]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [157, 220]} ] }, { "name": "leaf_set4", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, 135, 0] }, { "name": "leaf10", "parent": "leaf_set4", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [35, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [16, 96]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [213, 150]} ] }, { "name": "leaf11", "parent": "leaf10", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [74, 91]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [195, 205]} ] }, { "name": "leaf12", "parent": "leaf11", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [98, 97]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [143, 220]} ] }, { "name": "leaf_set5", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, 180, 0] }, { "name": "leaf13", "parent": "leaf_set5", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [40, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [95, 81]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [213, 134]} ] }, { "name": "leaf14", "parent": "leaf13", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [66, 91]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [175, 205]} ] }, { "name": "leaf15", "parent": "leaf14", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [98, 89]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [220, 41]} ] }, { "name": "leaf_set6", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, -135, 0] }, { "name": "leaf16", "parent": "leaf_set6", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [35, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [95, 69]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [211, 118]} ] }, { "name": "leaf17", "parent": "leaf16", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [90, 41]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [123, 204]} ] }, { "name": "leaf18", "parent": "leaf17", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [98, 57]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [216, 7]} ] }, { "name": "leaf_set7", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, -90, 0] }, { "name": "leaf19", "parent": "leaf_set7", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [36, 93]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [210, 25]} ] }, { "name": "leaf20", "parent": "leaf19", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [0, 0]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [0, 0]} ] }, { "name": "leaf21", "parent": "leaf20", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [56, 98]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [103, 185]} ] }, { "name": "leaf_set8", "parent": "leaves_outer", - "pivot": [0, 114.5, 0], + "pivot": [0, 281.5, 0], "rotation": [0, -45, 0] }, { "name": "leaf22", "parent": "leaf_set8", - "pivot": [0, 114.5, -3], + "pivot": [0, 281.5, -6], "rotation": [30, 0, 0], "cubes": [ - {"origin": [-2, 114.5, -3], "size": [4, 8, 0], "uv": [28, 93]} + {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [20, 210]} ] }, { "name": "leaf23", "parent": "leaf22", - "pivot": [0, 122.5, -3], + "pivot": [0, 298.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-2, 122.5, -3], "size": [4, 11, 0], "uv": [87, 81]} + {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [103, 204]} ] }, { "name": "leaf24", "parent": "leaf23", - "pivot": [0, 133.5, -3], + "pivot": [0, 323.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-1.5, 133.5, -3], "size": [3, 8, 0], "uv": [50, 98]} + {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [175, 147]} ] }, { - "name": "leg_left", + "name": "leg_right", "parent": "body", - "pivot": [4.5, 8.5, 0], + "pivot": [-9, 20.5, 0], "cubes": [ - {"origin": [2, 6, -2.5], "size": [5, 5, 5], "inflate": 0.001, "uv": [30, 83]} + {"origin": [-14, 12, -5], "size": [10, 11, 10], "uv": [63, 185]} ] }, { - "name": "leg_left2", - "parent": "leg_left", - "pivot": [4.5, 6, -2.5], + "name": "leg_right2", + "parent": "leg_right", + "pivot": [-9, 12, -6.5], "cubes": [ - {"origin": [2, 2, -2.5], "size": [5, 4, 5], "uv": [85, 14]} + {"origin": [-14, 2, -5], "size": [10, 10, 10], "inflate": 0.02, "uv": [192, 185]} ] }, { - "name": "foot_left", - "parent": "leg_left2", - "pivot": [4.5, 2.25, 0.5], + "name": "foot_right", + "parent": "leg_right2", + "pivot": [-9, 4.75, 1.5], "cubes": [ - {"origin": [1.5, 0, -3.25], "size": [6, 3, 6], "uv": [50, 78]}, - {"origin": [3.25, 0, -5.25], "size": [0, 2, 2], "uv": [47, 0]}, - {"origin": [5.75, 0, -5.25], "size": [0, 2, 2], "uv": [40, 4]} + {"origin": [-15, 0, -9.75], "size": [12, 5, 16], "uv": [83, 133]} ] }, { - "name": "leg_right", + "name": "toe_right", + "parent": "foot_right", + "pivot": [-5, 4, -9.75], + "cubes": [ + {"origin": [-7, 0, -14.75], "size": [4, 4, 5], "uv": [27, 154]} + ] + }, + { + "name": "toe_right2", + "parent": "foot_right", + "pivot": [-13, 4, -9.75], + "cubes": [ + {"origin": [-15, 0, -14.75], "size": [4, 4, 5], "uv": [145, 0]} + ] + }, + { + "name": "leg_left", "parent": "body", - "pivot": [-4.5, 8.5, 0], + "pivot": [9, 20.5, 0], "cubes": [ - {"origin": [-7, 6, -2.5], "size": [5, 5, 5], "inflate": 0.001, "uv": [83, 0]} + {"origin": [4, 12, -5], "size": [10, 11, 10], "uv": [180, 31]} ] }, { - "name": "leg_right2", - "parent": "leg_right", - "pivot": [-4.5, 6, -2.5], + "name": "leg_left2", + "parent": "leg_left", + "pivot": [9, 12, -6.5], "cubes": [ - {"origin": [-7, 2, -2.5], "size": [5, 4, 5], "uv": [78, 60]} + {"origin": [4, 2, -5], "size": [10, 10, 10], "inflate": 0.02, "uv": [189, 57]} ] }, { - "name": "foot_right", - "parent": "leg_right2", - "pivot": [-4.5, 2.25, 0.5], + "name": "foot_left", + "parent": "leg_left2", + "pivot": [9, 4.75, 1.5], + "cubes": [ + {"origin": [3, 0, -9.75], "size": [12, 5, 16], "uv": [0, 133]} + ] + }, + { + "name": "toe_left", + "parent": "foot_left", + "pivot": [5, 4, -9.75], + "cubes": [ + {"origin": [3, 0, -14.75], "size": [4, 4, 5], "uv": [95, 0]} + ] + }, + { + "name": "toe_left2", + "parent": "foot_left", + "pivot": [13, 4, -9.75], "cubes": [ - {"origin": [-7.5, 0, -3.25], "size": [6, 3, 6], "uv": [77, 72]}, - {"origin": [-3.25, 0, -5.25], "size": [0, 2, 2], "uv": [34, 27]}, - {"origin": [-5.75, 0, -5.25], "size": [0, 2, 2], "uv": [34, 25]} + {"origin": [11, 0, -14.75], "size": [4, 4, 5], "uv": [76, 52]} ] } ] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0759_stufful/0_stufful_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0759_stufful/0_stufful_base.json index 0e4ed218f8..f6391f4b34 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0759_stufful/0_stufful_base.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0759_stufful/0_stufful_base.json @@ -1,19 +1,19 @@ { - "species": "cobblemon:bewear", + "species": "cobblemon:stufful", "order": 0, "variations": [ { "aspects": [], - "poser": "cobblemon:bewear", - "model": "cobblemon:bewear.geo", - "texture": "cobblemon:textures/pokemon/0760_bewear/bewear.png", + "poser": "cobblemon:stufful", + "model": "cobblemon:stufful.geo", + "texture": "cobblemon:textures/pokemon/0759_stufful/stufful.png", "layers": [] }, { "aspects": [ "shiny" ], - "texture": "cobblemon:textures/pokemon/0760_bewear/bewear.png" + "texture": "cobblemon:textures/pokemon/0759_stufful/stufful_shiny.png" } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0760_bewear/0_bewear_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0760_bewear/0_bewear_base.json index 4f0f68fa9b..3d25f04a9b 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0760_bewear/0_bewear_base.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0760_bewear/0_bewear_base.json @@ -1,19 +1,19 @@ { - "species": "cobblemon:stufful", + "species": "cobblemon:bewear", "order": 0, "variations": [ { "aspects": [], - "poser": "cobblemon:stufful", - "model": "cobblemon:stufful.geo", - "texture": "cobblemon:textures/pokemon/0759_stufful/stufful.png", + "poser": "cobblemon:bewear", + "model": "cobblemon:bewear.geo", + "texture": "cobblemon:textures/pokemon/0760_bewear/bewear.png", "layers": [] }, { "aspects": [ "shiny" ], - "texture": "cobblemon:textures/pokemon/0759_stufful/stufful.png" + "texture": "cobblemon:textures/pokemon/0760_bewear/bewear_shiny.png" } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor.png index 3a62e623d251e46690866bbded0cad3ae9215d27..9e62dc19c66fd4f8e0e2d90171eb34ecac7f5254 100644 GIT binary patch literal 11370 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 XLKDN diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan.png index e32e3d385971e4c17f6ef1d7502c1f51d12c4401..13422919b06955790c875b93fd7d95f0698f4abc 100644 GIT binary patch literal 23561 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 LUDZ0}m+$`{{BL-? literal 7316 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 literal 3540 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 O0000%%_WpzDD;q$9t=4Ia!KPu=_!{&{(!W- z6ml^1(3Ttw4JCv?A(-GchhS<`h{2Rrm64IKoQWlw6-l;--8XtOJG)j&q3r|X*_pSq z@0<5y-g`;_K>gMk4*^xzp3)E}uRlt3m*>>lP<{majlIwq0M_r-F$kT!{wP7?b5j!@ z0Eo=6S{EXXukJobSYB29iZ?TSAV2X`x0-7H&iaPpKg7WUKxz80`m5hMcx!escI99ee{{2%~`Lij_X zkcQmufcD@(X)K%lH5!NZ2|x@CUJS;s@ohD+SQ~=K=sbys*G_nrcNLYU4{P9u@*@DC zS%ci}DAyt2q8J=Na5x11v+vsq2nk6*b;%{yZj%DLk*-0sy?SavpMB_tn;$ivWOpUg-0gz-oTG=xn#~=95NHbY_=;hQHQmNOcH}hSYd^ zqKe$crO03j0L_V;xO25^y|Mk@Qdk7a!&3K%bXzJ}ZR4}~!-f0i;-OQnni((2D2p=l0>FMKQAFVB z>XT18A!{JerLi2o{b^Oj5N_&Z8Gum>$fj!*CMq9@BilQ&?m{+$Ke7t;Jw6weDg*vi zDR(v+yXNMat%cfaPWI zpwDq6MA{EtveVD+r5-rR?4x3a$P8-n%u=b(S^rt_*hW<)P{zJ@ZBdbv;wNS+R_T8$*U`>=dgaSj)&Jyc)Vwz34f%Y z*GGYrQjZa~0*DS%%8p+PBn_YJS$x?HW~O=5-0j=9HR0Ef9rxr;aJZu>R5$k^cYFTx z(Ij}oW$J7(ln9ZwOt95I8VU?=te84+Y8;q) zREEdh0Ej=(sD@`0Ma2vXdO$zD1^_22;woVc5Tcm!?|H-L=|B|!ZZFghQ+w|AAdV(O z{%@-VUY4Q)o^4IGyZuBcazjfxE9%YwbvsA==taNVnnj^{vLM`8k2B9zXQ#itrS;=@*`>; z@XPaFuc!S=Wm}Ki-s2ZhuTrUauIqZ{vwi3PJ|#HlI68m+eF)+Eo0Ne$vgehR zmA~EY{x|86*~Kw`DWW+73;4jz=l?7H1>m7>#?aL$RsaA14rN$LW=%~1DgXcg2mk;8 W00000(o>TF0000 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0760_bewear/bewear_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0760_bewear/bewear_shiny.png new file mode 100644 index 0000000000000000000000000000000000000000..273864218ad01fdff55b0479b69f699d5ce073b4 GIT binary patch literal 5721 zcmcIo_d6Tj+YYgdDn-pEwA75E_J~otp+@XgMQZQ8S5ed`YHzCM$BNjaMa|l!NbJ35 zYUK6(Bi`pa&$-V}=X%z4-RImfS}!0z z@YiNEHHpDfV{N08Ur`OOn{~sYCZee&J=IkR`(9K#B4!U}^d6&lY;YrrIfgdfZ9zWn z2f6-B;+O5BLdkl~vIZ9;ftT&xXz9yb|GULg4uP(_yCAiG9UUDSI72@ZT093IS|=9& z-j@-OC?x;{Y%Lso@04T;^bol|fh#Qk`ZVkA$d>K5_MeAMX{Zx&bMV4%&b58qrJq{V zsm*ywD8j0r6}G)Z;MZ|p=~onrySfZ!+VKS(?L?;P@^oUmafOphmxIY0k2}0>;Rl8( zP^B$+g_X>==^dZ&?$(#=GKr5eqpNOVX=O>gFe~P*%j@l(9lMs6mduOmz?#5^GR@>5 zcKqATALXJqXy&RJo0g`g-0G^Tve~=ymVZl(JMmGMQcIMEV}2I`TYCpZ_5M&7)qo0e zfE`rH0-w{XV!C@m8{d%A`!wD`X%f2Sa5l2)x-y(0gdmqVxd*!(8=;pqIIqA5IYBco zgOA_RK$QZ_Y@KA}DjGBR`S{Xu%Y}p}gtJKJ9XrQ5e7{iuRCc6qwwL7R{$^klH#<`{ zz6|0CPdP10_*ljdwC&AQjhqc61t{OwPlc{b8b7N)yk!*{K2jJZSj4+RV-K^bhb`wc z)~B=|jyBEE8=8+>7#JIC;#pX)M@Wb@Y;um2@1gvOP2TB>_3#|7?mS_(NT$4cfHY$H zd}L(X%*3-R4&jlIC95`Tk2S0Lc)u$2YckKHsoWR-0C_gHcuaSg?DT?b({`yvI^0f7G4 z66i($Ze#b`k<`ev5GrC2*yXy#|HWkSBeXImWDMr+w$cO@lVLzGO8Xu~4u+m5*&}xM??SU%V}3u^WB2ygWDy z==zAOUss*m91VU+c=9711cOFkOqR>bf*wM}JrkyWvBliQaLR-)dUfDrZd};ERY&P+ zD`UJ2{voT`r=E@DHHQier4dyv)u$hP%Xtz84>o{x*;3iIw$(qE+{gw^**FR1+y45O zd}TtEzp2)9dZ9u|W%sb$@0SC|vaxo11)6n=wtk5;HX8^aR@{u3859$fT!(Z^>W@;J zb?)VphI)T%x|ncgQ%i+yI+$9`&R?HyesG*l7@`~$tY56CZ#^Um^9mG{jGUjOABDA@ zUib|X-sg4}6Jv}N(UBkmn0*ADo7%rAN+_f+8D;PUxbz_WL=*XlTlW)~m`y;%O@{lJ zaD(doc??D<7@l#f`w?j_Gt?tM-QiWm40^@J%McI}_vh?72PtH!JcD!5Y^SNiJ z{$UM;!y!jZUwj)jz4rrN@%1TMo2j-k^lTz+(Z6PPXe0=l-s5XH?u!iop^x{w_sXpB zX98c=e)NG2iN6wndzE}T<+8deinV>m(YmhZXi~e-?T6w64MqALuL=SP$HoiJ);e&V)VFU=~``SaJ9a8rKo zy1YU1Z$`K0&Hz9uQCbTz5$+N&m83rolRhyh_*p?dzfVa=M{i>Ln^7s}C>$*b7t^gVhRigVk10t+weAtivLg9@fu`^nRDGRY z^^eC(nn4-TAN>_X{{a{currMXi)~;k`XqI7`hoSXhXqO;Mk5jGi4G>zIS(w`lJs`m z_~b-Pn&Pun+g7;_psbUJqx()9v1X&$aK!+C&)I_^M8H8mcX#wvuKIN-!(QWoPvGlI z79`3zTx9#bp&>;De98hAVBe%8ZmU|ypTlDpz%cXtZ#J){EkTe4(RoR40>WcB{Oy(> zL+!ieMg5>u)B2HU={$-yZ}c$vwMiql;O{uHrG9WLv6dXsi!hF^UkqmNgGwaYj&J<< zRp744zlT>B@;knW^69WJ5{RO)o?c;h#9c9(ohjIDHK$ouHsOp|2SMs30ESgkg0ftJ z+5}X9CuiNd594BzhO%GQ&a>9E4-u>5jjXlLu!sVpX?%uy-MpT10o#sqCd)a10~wl~ zl79nV9pOKTe~>5(JmNITASJqDw#esbxmNvTQ=h>+0H{7zs*SQfc}7)Wt$>A+Z1yF{yXL8d{4K4L^OE60bqs2VXKkrjU zWgSO-ND~z&5w7^UQCko-!$hIk;tjTyw^(=d+?8S%gRm#&!{J0?xRq4^hJt%VKsoqC zU2jXBuIzZfk$W(mGy8*!|dwfGW8Xjbd>S3Q!?gt3amA)-jBaul@tEP zs;v5C!V)0Kx;yKz(Dw4RddQ4Rkn_K>Y4NbB`VSx#QgfnWwNZGa%3;SzMK&GaeO=d> z`QHK3urvz;I>oQ0f~vf}v9l?cWIqKwTHC{)L!I{WJz-3dX#kSP5InHg^SsyLAxv%n zw7?HyxoVA1a8?s_I+^m#yx?P3(W9;GNVIrooO0(4>FmsG$2DDugG-xhka*zPP~O0Y zXUzBG_tgNK#mu?lki|3-8(obB3cJWge<02$Qm1n?ydZI_LNc0qjJ3}cVAK&LgvDw; znfR*bt=F*l1^dNcyEv)Bs2ulmu6MQ;oQY%07cut}=Uv{GlrAn^-JR3>M@QT_?goNmQTsuQA0CM3w!c=Y!)TiAQZV-bR7R&}Fzb$| zWd8uC`K>N@vw^rpl)d`9Ty2%U8xvh;dfboo%N3!e%vlKgh*hsAghRHYlV}Q4r%8ynuorQ z??Oq9T~AL%nUR?A`){JJfC zY+H0Vc5u-F5r}nP3Pyq5i}EBl7uBDXM1f`cE5E8tSV?|?Kz9)`v50+Aar?n$Zt({H zWI&PX*=krl$pLp3_f|IVCPAqcs*+$7B|-GDJj}E^6e)ttPKB(YQeA*h>O6co-k6DG zfhuD4ay_L5JFwAQX;QdS?hUxIzpcd* z3nN|v;FZOZ+6NYVH>!7O^#-4YCgocODJ!pO&tR+b+s1U6Wr;I5?zcvboDj1-5^H?Y zoK@CFa`!>@jW`@}fdSN)Nn#VffE;{D4KJQrWFDqF##?N2>RttWVGb*cURGt3|IOw` zA|=>=(qXvUF2&z7RQ9=8kTw=B0wZUlFJG?LtSs$aIMvBB!Ara(8N9;Bcdb&*VCC@O zo&1sLs-WZE{I957#%?NMN=Z!x2g#F3HWT-j3dEizJsuFzLRjzowCYmmPxwB{$3SOJ zs2A-#XHp#alT6v0l!kV;t+iUmzX5;IOcNAz=80RMCcV8PqDyS*bzwd}vMZW!(EiUjkyq zQXGBIzwQV)91Et+XK24~W+>BQao+RC`f|Yjx(2%g%XF~fU#fT3l*@^G?e*i{7yjNF zK|XXyQGS(`4nNE1w>_ziJ$0@M59TrcxDYp>T#G$vS})&Yn=*#EZ!8TJ<$XdSR7q8i z@9Gw)Z<-4fjM}6^T~KW<{a_XYX2t?#u*`E8kd((Bq8#ufw>eA_g|MPXd&&_*EWd9GffWV%*!H0fKK(;oIJte4E4y^gmI zMZ=kWc?x}`-6MJ9W&{-Rw_`oZVBgRh`SH!o*5GdHv$ZlvwkHe96|2GFO0PJh_B$Vi z9j(#h%XgSdp|8qKot|azKY4HoowN1h9zVay-d{fQh=?T^hj}jkJf)2~jQdnvL zrU*+QmODL%SDQjEvD02t5y}E5X_kWTa&tdL5^5P*YCcI6f6#z2*v?DGl5P3TUp_gB zjG&so9uu8AX?cBF^DF-GOx$!W4%_L~pB0iW8?yPN^kgIjg2(x=+C1QJ7v*m^(aucJ zw$!c*T>r<%0-cd~I**kiuMF)XwwSw3eZ^M>ffxsEr})P3%Q<=|;xpa2at!frFD+vcpy8PO{?=-SKfJGI(yhxn zWK;?LUm%aE25mrtAHyyXCU6c3E)MdLKhVKQ2Av*koxGSQmmq5>PF@WwnH^dnw@$~~ zq)gi|lo|37*vPFV93J5m^Vnx_=tZ8ohfN>Tmf@btEBSmdt+dbLjl6}*w`8n`jE@>F z|5?Q!lMxvPVYqw%lDL8&SPO9HzBYq!>`7eci^}c6~_Bi0t=-M7!!YBFXhdnU+pBS)>46*d*2&nD8)!6!8raOK-5D{j@ zKq&}2B1a@!>*th9ffShldMD)W1EDMBp;LzQ>7CI!aSH#^UAUJ)f9Zqy8$ShYO2xB1 zk4xnr{UGX{bZflS#a%jAxb+SjC+HhRYIHK1xq%p;(KEuoAd1Saw$#XI&gZa7! zZ#PYc+M_cuj4xJa^+PxMA+d{-Cs(=mYJ#r%AB)K8No`QLG-?}JDFwQGH#{tS(i+}K zV&=?oA39rKI7<`3z}~aW9geCE(K2gFb``N(>p?B4^~JA86Mu z$3fnH88K`nnjsR$A|WZp5OV2L>@6Ns?ZwLvxf%FTGd04)G~eQbVZu`f78x2b-eUW|ReeIDEaN951iT>y zc@_1#qq@&e(_bTk;@fij=@YCzx;~QoIDS1O|F;_Lz+o2lja%}Q)N;rn(F&bx^>s~W zFb(>8XY#;XyQZifxfv9E2nmiD%ab;ppX}?c9(p3$hidoBPW&%?2K1!l_Jrm<8;I}? zA(ai>fBGpB3OcOGqwxwxsS20Rjynh^PVLf~zgC{!qq}4}&}&6;>3me1pOg1m8WZS#2G=k;x2CQo)(GIRtmjg`E{fO1OTFPrD?0 z%_wh(_-@94I9R>cojPD-Pp?!*%D-ct8Urb1)fcHB6GEdu@U3ig>qb8 zmu+6!`FmYNUVX~gOl1UIl4E@nv-Q=clef$YYq|X!NA;b!DnnUSCF(Mz`ju7VZTmE6Xq7A*xBohhMDE^87^{v$i4eFQN$5nIYO6c_OY>S_X zQaJN(=k)W`@hl2Z(UI8K4vx<6D%wc_V%ImP8wy*%NyY|{G6h(9@II?xbaRIPBmAcz zaDV@cLB{LCEsikZV(^1Eha#hq~je3&s+ z$eLx|+_6XKLB_&YVWI|w!}S00PXC@SaTf(OKH>?PDq+IY%I3^?3r*|LdGoEB2u|e`MqGqPrg)+f)snEej-48R~E(fnFyC^Xr;cR6h z;AI)3F}MEFH_WcEZAK=v7reXp8OCN$6+tbusM)-`C%d*#duIG*0%A|uVZQkD(f_*v vLU2G$hICUEq-*cJFidG}plb8x4S@UpOmgr4vk9G)|AFdjm}0fOMcDrV Date: Tue, 10 Oct 2023 21:34:59 -0400 Subject: [PATCH 36/40] Fixed Pokemon not playing faint animations if fainted while asleep. Also fixed Alolan Raichu T-posing while battling. --- .../render/models/blockbench/pokemon/gen1/ArbokModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/BlastoiseModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/BulbasaurModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/CaterpieModel.kt | 2 +- .../models/blockbench/pokemon/gen1/CharmanderModel.kt | 2 +- .../models/blockbench/pokemon/gen1/CharmeleonModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/ClefableModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/ClefairyModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/DiglettModel.kt | 6 ++++-- .../render/models/blockbench/pokemon/gen1/DittoModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/ExeggutorModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/GloomModel.kt | 2 +- .../models/blockbench/pokemon/gen1/HitmonchanModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/HitmonleeModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/IvysaurModel.kt | 2 +- .../models/blockbench/pokemon/gen1/JigglypuffModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/KakunaModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/MagnemiteModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/MagnetonModel.kt | 2 +- .../models/blockbench/pokemon/gen1/MeowthGalarianModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/MetapodModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/OddishModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/OnixModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/ParasModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/ParasectModel.kt | 2 +- .../models/blockbench/pokemon/gen1/PonytaGalarianModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/PonytaModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/PorygonModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/PrimeapeModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/PsyduckModel.kt | 2 +- .../models/blockbench/pokemon/gen1/RaichuAlolanModel.kt | 2 -- .../render/models/blockbench/pokemon/gen1/SandshrewModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/SquirtleModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/VenusaurModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/VileplumeModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/WartortleModel.kt | 2 +- .../render/models/blockbench/pokemon/gen1/WeedleModel.kt | 2 +- 38 files changed, 40 insertions(+), 40 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt index 57c353b966..5b22eaf516 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt @@ -122,5 +122,5 @@ class ArbokModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState, - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("arbok", "faint") else null + ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("arbok", "faint") else null } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt index 0f9d48a466..33d86abb91 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt @@ -105,5 +105,5 @@ class BlastoiseModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("blastoise", "faint") else null + ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("blastoise", "faint") else null } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt index c3292581ea..888e58766f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt @@ -73,5 +73,5 @@ class BulbasaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("bulbasaur", "faint") else null + ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("bulbasaur", "faint") else null } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt index cefd31a094..b3c9776e72 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt @@ -68,5 +68,5 @@ class CaterpieModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("caterpie", "faint") else null + ) = bedrockStateful("caterpie", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt index 7b75aba0bc..e44ba72d71 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt @@ -78,5 +78,5 @@ class CharmanderModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isNotPosedIn(sleep)) bedrockStateful("charmander", "faint") else null + ) = bedrockStateful("charmander", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt index 346ec6829d..ab7812fa37 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt @@ -76,5 +76,5 @@ class CharmeleonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("charmeleon", "faint") else null + ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("charmeleon", "faint") else null } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt index 71461f6157..b4bb054caf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt @@ -66,5 +66,5 @@ class ClefableModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("clefable", "faint") else null + ) = bedrockStateful("clefable", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt index 4e6ed9dab8..064db69b6c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt @@ -66,5 +66,5 @@ class ClefairyModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("clefairy", "faint") else null + ) = bedrockStateful("clefairy", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt index ffe398bf9d..231455397d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt @@ -28,10 +28,12 @@ class DiglettModel(root: ModelPart) : PokemonPoseableModel() { override val profileScale = 0.9F override val profileTranslation = Vec3d(0.0, 0.15, 0.0) + lateinit var stand: PokemonPose + lateinit var walk: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { val blink = quirk("blink") { bedrockStateful("diglett", "blink").setPreventsIdle(false)} - registerPose( + stand = registerPose( poseName = "stand", poseTypes = STATIONARY_POSES + UI_POSES, quirks = arrayOf(blink), @@ -43,7 +45,7 @@ class DiglettModel(root: ModelPart) : PokemonPoseableModel() { idleAnimations = arrayOf(bedrock("diglett", "sleep")) ) - registerPose( + walk = registerPose( poseName = "walk", poseTypes = MOVING_POSES, quirks = arrayOf(blink), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt index 7f0f36f950..cf69d1e5c6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt @@ -74,5 +74,5 @@ class DittoModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("ditto", "faint") else null + ) = bedrockStateful("ditto", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt index b4d318fa60..6cf49f1c2d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt @@ -77,5 +77,5 @@ class ExeggcuteModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("exeggcute", "faint") else null + ) = bedrockStateful("exeggcute", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt index d598908fa9..6c7e486111 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt @@ -101,5 +101,5 @@ class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, battleidle)) bedrockStateful("exeggutor", "faint") else null + ) = bedrockStateful("exeggutor", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GloomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GloomModel.kt index fddb95be02..a5fa9878e8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GloomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GloomModel.kt @@ -60,5 +60,5 @@ class GloomModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState, - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("gloom", "faint") else null + ) = bedrockStateful("gloom", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt index d3853749ae..6ea168c29f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt @@ -92,5 +92,5 @@ class HitmonchanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("hitmonchan", "faint") else null + ) = bedrockStateful("hitmonchan", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt index 076abe6d3a..3b84202891 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt @@ -86,5 +86,5 @@ class HitmonleeModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bima override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("hitmonlee", "faint") else null + ) = bedrockStateful("hitmonlee", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt index ca331d273c..97f12c6af6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt @@ -75,5 +75,5 @@ class IvysaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("ivysaur", "faint") else null + ) = bedrockStateful("ivysaur", "faint") } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt index 3b945ad8b0..21b454bb45 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt @@ -63,5 +63,5 @@ class JigglypuffModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("jigglypuff", "faint") else null + ) = bedrockStateful("jigglypuff", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt index ff0b5fc0af..f44f711299 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt @@ -52,5 +52,5 @@ class KakunaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState, - ) = if (state.isPosedIn(standing)) bedrockStateful("kakuna", "faint") else null + ) = bedrockStateful("kakuna", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt index 3e54e33730..8d04cfb019 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt @@ -65,5 +65,5 @@ class MagnemiteModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("magnemite", "faint") else null + ) = bedrockStateful("magnemite", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt index 24dcb429fb..74331b33af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt @@ -65,5 +65,5 @@ class MagnetonModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("magneton", "faint") else null + ) = bedrockStateful("magneton", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt index 2b55d98282..5444edd53d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt @@ -88,5 +88,5 @@ class MeowthGalarianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("meowth_galarian", "faint") else null + ) = bedrockStateful("meowth_galarian", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt index ec1b879ac2..cf8224065c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt @@ -49,5 +49,5 @@ class MetapodModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing)) bedrockStateful("metapod", "faint") else null + ) = bedrockStateful("metapod", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt index 2e020d2bf8..5d18836091 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt @@ -63,5 +63,5 @@ class OddishModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("oddish", "faint") else null + ) = bedrockStateful("oddish", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt index 4cb14f44ec..edefb5010f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt @@ -101,5 +101,5 @@ class OnixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, battleidle)) bedrockStateful("onix", "faint") else null + ) = bedrockStateful("onix", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt index 12fa48ff57..60147112d3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt @@ -68,5 +68,5 @@ class ParasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState, - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("paras", "faint") else null + ) = bedrockStateful("paras", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasectModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasectModel.kt index 47fe0ea5fb..1f46b79ed2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasectModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasectModel.kt @@ -63,5 +63,5 @@ class ParasectModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("parasect", "faint") else null + ) = bedrockStateful("parasect", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt index 572e2bf0e3..c774f0c040 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt @@ -74,5 +74,5 @@ class PonytaGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFram override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("ponyta_galar", "faint") else null + ) = bedrockStateful("ponyta_galar", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt index 5f392b7a4e..b178e9dd55 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt @@ -79,5 +79,5 @@ class PonytaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("ponyta", "faint") else null + ) = bedrockStateful("ponyta", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt index 3a6699ae0b..0d1af7f98d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt @@ -70,5 +70,5 @@ class PorygonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("porygon", "faint2") else null + ) = bedrockStateful("porygon", "faint2") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt index f6c8835c8a..b42e333bbf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt @@ -66,5 +66,5 @@ class PrimeapeModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("primeape", "faint") else null + ) = bedrockStateful("primeape", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt index 9b760ae0e5..45d1dae8c9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt @@ -83,5 +83,5 @@ class PsyduckModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("psyduck", "faint") else null + ) = bedrockStateful("psyduck", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt index 9c3dc3e3ba..471372c30d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt @@ -44,7 +44,6 @@ class RaichuAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = STATIONARY_POSES + UI_POSES, transformTicks = 10, quirks = arrayOf(blink), - condition = { !it.isBattling }, idleAnimations = arrayOf( singleBoneLook(), bedrock("raichu_alolan", "ground_idle") @@ -61,7 +60,6 @@ class RaichuAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = MOVING_POSES, transformTicks = 10, quirks = arrayOf(blink), - condition = { !it.isBattling }, idleAnimations = arrayOf( singleBoneLook(), bedrock("raichu_alolan", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt index ad27b90489..7f6a15b4dc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt @@ -67,5 +67,5 @@ class SandshrewModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("sandshrew", "faint") else null + ) = bedrockStateful("sandshrew", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt index 8e497e6118..db7a3f5ee9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt @@ -100,5 +100,5 @@ class SquirtleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("squirtle", "faint") else null + ) = bedrockStateful("squirtle", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt index 2eef6dba71..b8759330b7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt @@ -75,5 +75,5 @@ class VenusaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("venusaur", "faint") else null + ) = bedrockStateful("venusaur", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt index e69ebc5d98..550eb7db85 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt @@ -63,5 +63,5 @@ class VileplumeModel(root: ModelPart) : PokemonPoseableModel() { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("vileplume", "faint") else null + ) = bedrockStateful("vileplume", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt index dbe0a186a9..50262094f8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt @@ -104,5 +104,5 @@ class WartortleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("wartortle", "faint") else null + ) = bedrockStateful("wartortle", "faint") } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt index 51b9a5e4cf..40f04dea37 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt @@ -67,5 +67,5 @@ class WeedleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun getFaintAnimation( pokemonEntity: PokemonEntity, state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk)) bedrockStateful("weedle", "faint") else null + ) = bedrockStateful("weedle", "faint") } \ No newline at end of file From 3c7c6402174c905242f3fae155f2638a22a8ebd2 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Tue, 10 Oct 2023 23:58:38 -0400 Subject: [PATCH 37/40] Last minute changes? More like last minute bugs. Amiright? --- .../spawn_pool_world/0285_shroomish.json | 48 +++++++++++++++ .../spawn_pool_world/0286_breloom.json | 48 +++++++++++++++ .../species/generation1/exeggcute.json | 26 ++++---- .../species/generation1/pikachu.json | 61 ++++++------------- 4 files changed, 128 insertions(+), 55 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json new file mode 100644 index 0000000000..0d073ed382 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json @@ -0,0 +1,48 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shroomish-1", + "pokemon": "shroomish", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "shroomish-2", + "pokemon": "shroomish", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "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/0286_breloom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json new file mode 100644 index 0000000000..3d1de575ba --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json @@ -0,0 +1,48 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shroomish-1", + "pokemon": "shroomish", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-46", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "breloom-2", + "pokemon": "breloom", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-46", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json index 80dfbd5f32..0596dfd778 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json @@ -31,27 +31,27 @@ ], "evolutions": [ { - "id": "exeggcute_exeggutor_kantonian", + "id": "exeggcute_exeggutor_alolan", "variant": "item_interact", - "result": "exeggutor", + "result": "exeggutor alolan", "consumeHeldItem": false, - "requirements": [ - { - "variant": "biome", - "biomeCondition": "cobblemon:is_jungle" - } + "learnableMoves": [ + "dragonhammer" ], + "requirements": [], "requiredContext": "cobblemon:leaf_stone" }, { "id": "exeggcute_exeggutor_alolan_kantonian", "variant": "item_interact", - "result": "exeggutor alolan", + "result": "exeggutor", "consumeHeldItem": false, - "learnableMoves": [ - "dragonhammer" + "requirements": [ + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_jungle" + } ], - "requirements": [], "requiredContext": "cobblemon:leaf_stone" } ] @@ -60,7 +60,7 @@ "name": "base", "evolutions": [ { - "id": "exeggcute_exeggutor_kantonian_alolan", + "id": "exeggcute_exeggutor_kantonian", "variant": "item_interact", "result": "exeggutor", "consumeHeldItem": false, @@ -71,7 +71,7 @@ "requiredContext": "cobblemon:leaf_stone" }, { - "id": "exeggcute_exeggutor_alolan", + "id": "exeggcute_exeggutor_kantonian_alolan", "variant": "item_interact", "result": "exeggutor alolan", "consumeHeldItem": false, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index eda3c0dcec..413a49ff31 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -1720,7 +1720,7 @@ "requirements": [ { "variant": "biome", - "biomeCondition": "cobblemon:is_temperate" + "biomeCondition": "#cobblemon:is_temperate" } ], "requiredContext": "cobblemon:thunder_stone" @@ -1733,7 +1733,12 @@ "learnableMoves": [ "psychic" ], - "requirements": [], + "requirements": [ + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_plains" + } + ], "requiredContext": "cobblemon:thunder_stone" } ] @@ -1741,17 +1746,6 @@ { "name": "base", "evolutions": [ - { - "id": "pikachu_raichu_kantonian", - "variant": "item_interact", - "result": "raichu", - "consumeHeldItem": false, - "learnableMoves": [ - "thunderpunch" - ], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - }, { "id": "pikachu_raichu_kantonian_alolan", "variant": "item_interact", @@ -1767,6 +1761,17 @@ } ], "requiredContext": "cobblemon:thunder_stone" + }, + { + "id": "pikachu_raichu_kantonian", + "variant": "item_interact", + "result": "raichu", + "consumeHeldItem": false, + "learnableMoves": [ + "thunderpunch" + ], + "requirements": [], + "requiredContext": "cobblemon:thunder_stone" } ] } @@ -1970,35 +1975,7 @@ "cobblemon.species.pikachu.desc" ], "preEvolution": "pichu", - "evolutions": [ - { - "id": "pikachu_raichu_kantonian", - "variant": "item_interact", - "result": "raichu", - "consumeHeldItem": false, - "learnableMoves": [ - "thunderpunch" - ], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - }, - { - "id": "pikachu_raichu_kantonian_alolan", - "variant": "item_interact", - "result": "raichu alolan", - "consumeHeldItem": false, - "learnableMoves": [ - "psychic" - ], - "requirements": [ - { - "variant": "biome", - "biomeCondition": "#minecraft:is_beach" - } - ], - "requiredContext": "cobblemon:thunder_stone" - } - ], + "evolutions": [], "baseScale": 0.5, "hitbox": { "width": 0.7, From d7c32e4ad843ffe782ee06212ffcb4add2e19041 Mon Sep 17 00:00:00 2001 From: tyzillion Date: Wed, 11 Oct 2023 18:12:24 -0400 Subject: [PATCH 38/40] A few spawns updated. --- .../spawn_pool_world/0092_gastly.json | 225 +++++++++--------- .../spawn_pool_world/0093_haunter.json | 5 + .../spawn_pool_world/0094_gengar.json | 5 + .../spawn_pool_world/0194_wooper.json | 3 + .../spawn_pool_world/0195_quagsire.json | 3 + .../spawn_pool_world/0524_roggenrola.json | 23 ++ .../spawn_pool_world/0525_boldore.json | 23 ++ .../spawn_pool_world/0526_gigalith.json | 23 ++ 8 files changed, 200 insertions(+), 110 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json index ad96af9a6e..20351291c0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json @@ -1,112 +1,117 @@ { - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gastly-1", - "pokemon": "gastly", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-31", - "weight": 5.4, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - }, - { - "id": "gastly-2", - "pokemon": "gastly", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "6-31", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "maxLight": 0, - "biomes": [ - "#cobblemon:is_overworld" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - }, - { - "id": "gastly-3", - "pokemon": "gastly", - "presets": [ - "derelict" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-31", - "weight": 5.4, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld" - ] - } - }, - { - "id": "gastly-4", - "pokemon": "gastly", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "6-31", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "maxLight": 0, - "biomes": [ - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "gastly-5", - "pokemon": "gastly", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "6-31", - "weight": 9.0, - "condition": { - "biomes": [ - "#minecraft:is_nether" - ] - }, - "drops": { - "amount": "1", - "entries": [ - { - "item": "minecraft:ghast_tear", - "percentage": 2.5 - } - ] - } - } - ] + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gastly-1", + "pokemon": "gastly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "6-31", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "gastly-2", + "pokemon": "gastly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "maxLight": 0, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "gastly-3", + "pokemon": "gastly", + "presets": [ + "derelict" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "6-31", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "gastly-4", + "pokemon": "gastly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "maxLight": 0, + "biomes": [ + "#cobblemon:is_spooky" + ] + } + }, + { + "id": "gastly-5", + "pokemon": "gastly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "biomes": [ + "#minecraft:is_nether" + ] + }, + "drops": { + "amount": "1", + "entries": [ + { + "item": "minecraft:ghast_tear", + "percentage": 2.5 + } + ] + } + } + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json index 78ada91398..9f249a388c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json @@ -61,6 +61,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] } }, { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json index 4e631c2148..fb5a5da1c0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json @@ -61,6 +61,11 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] } }, { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json index 60dd582644..bc16057c7c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -55,6 +55,9 @@ "maxY": 62, "biomes": [ "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "#minecraft:water" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json index de55670a28..90c9a700a5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json @@ -55,6 +55,9 @@ "maxY": 62, "biomes": [ "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "#minecraft:water" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json index 5a36dfb877..d7ce2fc78c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json @@ -20,6 +20,29 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "roggenrola-2", + "pokemon": "roggenrola", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "3-28", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_deep_dark" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json index 75f7d07d43..e02eda6138 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json @@ -20,6 +20,29 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "boldore-2", + "pokemon": "boldore", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "25-39", + "weight": 0.54, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_deep_dark" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json index cc56a3c3ed..7a7402b7bb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json @@ -20,6 +20,29 @@ "biomes": [ "#cobblemon:is_overworld" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "gigalith-2", + "pokemon": "gigalith", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "34-52", + "weight": 0.06, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_deep_dark" + ] } } ] From f37924fb0c96cc34ad8bf0f4de5817c91fbccd42 Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 12 Oct 2023 10:44:16 -0500 Subject: [PATCH 39/40] Fixes owned Pokemon not being removed, when they should. --- .../common/entity/pokemon/PokemonEntity.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt index 57b3979da5..8057ad5066 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt @@ -989,14 +989,21 @@ class PokemonEntity( } override fun onStoppedTrackingBy(player: ServerPlayerEntity?) { - if (player != null) { - if(this.ownerUuid == player.uuid && tethering == null) { - val chunkPos = ChunkPos(BlockPos(x.toInt(), y.toInt(), z.toInt())) - (world as ServerWorld).chunkManager - .addTicket(ChunkTicketType.POST_TELEPORT, chunkPos, 0, id) - this.goalSelector.tick() - if(distanceTo(player.blockPos) > 100) pokemon.recall() + if (player == null) { + return + } + + if(this.ownerUuid == player.uuid && tethering == null) { + if (player.isDisconnected) { + this.remove(RemovalReason.DISCARDED) + return } + + val chunkPos = ChunkPos(BlockPos(x.toInt(), y.toInt(), z.toInt())) + (world as ServerWorld).chunkManager + .addTicket(ChunkTicketType.POST_TELEPORT, chunkPos, 0, id) + this.goalSelector.tick() + if(distanceTo(player.blockPos) > 100) pokemon.recall() } } From 072ad5ff12c7340ba192dff2873c1101d5bc5e56 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 13 Oct 2023 15:27:22 +1000 Subject: [PATCH 40/40] Fixed Haban hitbox, fixed one weird Pomeg berry placement --- .../data/cobblemon/berries/haban_berry.json | 22 ++----------------- .../data/cobblemon/berries/pomeg_berry.json | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/berries/haban_berry.json b/common/src/main/resources/data/cobblemon/berries/haban_berry.json index 90c07bb3ad..2d3f6b5dc5 100644 --- a/common/src/main/resources/data/cobblemon/berries/haban_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/haban_berry.json @@ -140,26 +140,8 @@ "cobblemon:sitrus_berry": "cobblemon:enigma_berry", "cobblemon:enigma_berry": "cobblemon:pomeg_berry" }, - "sproutShape": [ - { - "minX": 7, - "minY": -1, - "minZ": 7, - "maxX": 9, - "maxY": 0, - "maxZ": 9 - } - ], - "matureShape": [ - { - "minX": 0, - "minY": 0, - "minZ": 0, - "maxX": 16, - "maxY": 32, - "maxZ": 16 - } - ], + "sproutShape": "short-sprout", + "matureShape": "short-mature", "flavors": { "SWEET": 10, "BITTER": 20 diff --git a/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json b/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json index 2a21784d70..1430db913a 100644 --- a/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json @@ -79,7 +79,7 @@ }, { "position": { - "x": -2.5, + "x": 6.6, "y": 12.5, "z": 8.0 },