diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBiomeTags.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBiomeTags.kt index 1ee4e24158..dabd626efd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBiomeTags.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBiomeTags.kt @@ -22,7 +22,7 @@ import net.minecraft.registry.tag.TagKey object CobblemonBiomeTags { @JvmField - val IS_ABYSS = create("is_abyss") + val IS_DEEP_DARK = create("is_deep_dark") @JvmField val IS_ARID = create("is_arid") @JvmField @@ -38,7 +38,7 @@ object CobblemonBiomeTags { @JvmField val IS_COLD = create("is_cold") @JvmField - val IS_DEEP = create("is_deep") + val IS_DEEP_OCEAN = create("is_deep_ocean") @JvmField val IS_DESERT = create("is_desert") @JvmField @@ -52,9 +52,9 @@ object CobblemonBiomeTags { @JvmField val IS_FRESHWATER = create("is_freshwater") @JvmField - val IS_FRIGID = create("is_frigid") + val IS_COLD_OCEAN = create("is_cold_ocean") @JvmField - val IS_FROZEN = create("is_frozen") + val IS_FROZEN_OCEAN = create("is_frozen_ocean") @JvmField val IS_GLACIAL = create("is_glacial") @JvmField @@ -68,7 +68,7 @@ object CobblemonBiomeTags { @JvmField val IS_JUNGLE = create("is_jungle") @JvmField - val IS_LUKEWARM = create("is_lukewarm") + val IS_LUKEWARM_OCEAN = create("is_lukewarm_ocean") @JvmField val IS_LUSH = create("is_lush") @JvmField @@ -86,7 +86,7 @@ object CobblemonBiomeTags { @JvmField val IS_PLATEAU = create("is_plateau") @JvmField - val IS_REEF = create("is_reef") + val IS_WARM_OCEAN = create("is_warm_ocean") @JvmField val IS_RIVER = create("is_river") @JvmField @@ -96,7 +96,7 @@ object CobblemonBiomeTags { @JvmField val IS_SKY = create("is_sky") @JvmField - val IS_SNOWY = create("is_snowy") + val IS_SNOWY_FOREST = create("is_snowy_forest") @JvmField val IS_SPOOKY = create("is_spooky") @JvmField 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/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..3d756a21aa --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ancient_city.json @@ -0,0 +1,26 @@ +{ + "condition": { + "structures": [ + "minecraft: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..db660ae249 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json @@ -0,0 +1,22 @@ +{ + "condition": { + "structures": [ + "minecraft: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..ef5949b2ab --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json @@ -0,0 +1,19 @@ +{ + "condition": { + "structures": [ + "minecraft: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/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/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/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/illager_structures.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json new file mode 100644 index 0000000000..33e88ad04b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json @@ -0,0 +1,10 @@ +{ + "condition": { + "structures": [ + "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 new file mode 100644 index 0000000000..b9e5fc583e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json @@ -0,0 +1,18 @@ +{ + "condition": { + "structures": [ + "minecraft: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/natural.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/natural.json index 2a30fb9b6b..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 @@ -126,5 +126,10 @@ "#c:vermiculite_ores", "#c:zinc_ores" ] + }, + "anticondition": { + "neededBaseBlocks": [ + "minecraft:farmland" + ] } } 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..76157c7e0b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_fossil.json @@ -0,0 +1,10 @@ +{ + "condition": { + "structures": [ + "minecraft: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..b553ac655b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json @@ -0,0 +1,30 @@ +{ + "condition": { + "structures": [ + "minecraft:bastion_remnant", + "minecraft: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..db668d632a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json @@ -0,0 +1,13 @@ +{ + "condition": { + "structures": [ + "minecraft: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..14131aeda9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json @@ -0,0 +1,18 @@ +{ + "condition": { + "structures": [ + "#minecraft: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..4cdc891909 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json @@ -0,0 +1,23 @@ +{ + "condition": { + "structures": [ + "minecraft: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..0c25211a2c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/ruined_portal.json @@ -0,0 +1,12 @@ +{ + "condition": { + "structures": [ + "#minecraft: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..142566cfed --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/shipwreck.json @@ -0,0 +1,12 @@ +{ + "condition": { + "structures": [ + "#minecraft: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..3478220a9b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/stronghold.json @@ -0,0 +1,15 @@ +{ + "condition": { + "structures": [ + "minecraft: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..3bebe19751 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/trail_ruins.json @@ -0,0 +1,58 @@ +{ + "condition": { + "structures": [ + "minecraft: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/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_detail_presets/urban.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/urban.json index 2a7a489362..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,12 +1,6 @@ { "condition": { "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 +18,10 @@ "minecraft:red_concrete", "minecraft:black_concrete" ] + }, + "anticondition": { + "structures": [ + "minecraft:trail_ruins" + ] } } 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_detail_presets/woodland_mansion.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json new file mode 100644 index 0000000000..5ffbdc9d1b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/woodland_mansion.json @@ -0,0 +1,22 @@ +{ + "condition": { + "structures": [ + "minecraft: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/0001_bulbasaur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0001_bulbasaur.json index 4382cfff88..966e34e08b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0001_bulbasaur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0001_bulbasaur.json @@ -17,7 +17,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0002_ivysaur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0002_ivysaur.json index 62018d81b5..945f3a38ae 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0002_ivysaur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0002_ivysaur.json @@ -17,7 +17,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0003_venusaur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0003_venusaur.json index 8fb86d6e0f..6d53a4599f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0003_venusaur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0003_venusaur.json @@ -17,7 +17,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } 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/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..6a77e989f0 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,12 +58,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "2-19", + "level": "1-20", "weight": 7.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } 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..2f8c574d36 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,12 +58,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-20", + "level": "7-21", "weight": 2.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } 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..49555db284 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,12 +59,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-39", + "level": "10-40", "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ], "timeRange": "day", "isRaining": false 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..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 @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "5-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": true, @@ -21,8 +21,7 @@ "#cobblemon:is_temperate", "#cobblemon:is_sky" ], - "timeRange": "day", - "isRaining": false + "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 67971c7077..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 @@ -21,8 +21,7 @@ "#cobblemon:is_temperate", "#cobblemon:is_sky" ], - "timeRange": "day", - "isRaining": false + "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 61ac5d06eb..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 @@ -21,8 +21,7 @@ "#cobblemon:is_temperate", "#cobblemon:is_sky" ], - "timeRange": "day", - "isRaining": false + "timeRange": "day" }, "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..b9138ffc41 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, @@ -47,7 +47,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -60,7 +60,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, @@ -71,7 +71,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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, @@ -95,7 +95,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -108,7 +108,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-25", + "level": "1-25", "weight": 9.0, "condition": { "canSeeSky": false, @@ -119,7 +119,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..41abe7fd2b 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", @@ -47,7 +47,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -71,7 +71,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -79,7 +79,7 @@ "id": "raticate-alolan-1", "pokemon": "raticate alolan", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -95,7 +95,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -119,7 +119,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, 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..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 @@ -13,7 +13,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-26", + "level": "1-26", "weight": 9.0, "condition": { "canSeeSky": true, @@ -22,8 +22,7 @@ "#cobblemon:is_savanna", "#cobblemon:is_sky" ], - "timeRange": "day", - "isRaining": false + "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 c124e60be1..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 @@ -22,8 +22,7 @@ "#cobblemon:is_savanna", "#cobblemon:is_sky" ], - "timeRange": "day", - "isRaining": false + "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 035fe06087..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 @@ -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,11 +120,11 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-29", + "level": "4-29", "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 31eef4a4c1..3b39c5d2c1 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,20 +12,50 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-32", + "level": "16-32", "weight": 0.18, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ "#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", + "#cobblemon:is_tropical_island" + ] + } } ] } \ 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 a5a42fde2f..fc4eb567a0 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,20 +12,50 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-48", + "level": "27-49", "weight": 0.02, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest" - ], - "timeRange": "day" + ] }, "anticondition": { "biomes": [ "#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", + "#cobblemon:is_tropical_island" + ] + } } ] } \ No newline at end of file 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..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,19 +7,19 @@ "id": "nidoranf-1", "pokemon": "nidoranf", "presets": [ - "natural" + "natural", + "wild" ], "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..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,19 +7,19 @@ "id": "nidorina-1", "pokemon": "nidorina", "presets": [ - "natural" + "natural", + "wild" ], "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..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,19 +7,19 @@ "id": "nidoqueen-1", "pokemon": "nidoqueen", "presets": [ - "natural" + "natural", + "wild" ], "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..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,19 +7,19 @@ "id": "nidoranm-1", "pokemon": "nidoranm", "presets": [ - "natural" + "natural", + "wild" ], "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..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,19 +7,19 @@ "id": "nidorino-1", "pokemon": "nidorino", "presets": [ - "natural" + "natural", + "wild" ], "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..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,19 +7,19 @@ "id": "nidoking-1", "pokemon": "nidoking", "presets": [ - "natural" + "natural", + "wild" ], "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..90510459a5 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,20 +12,48 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-30", - "weight": 5.94, + "level": "5-30", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest" - ], - "timeRange": "twilight" + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ] }, "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", @@ -36,14 +64,36 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-30", - "weight": 5.94, + "level": "5-30", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy" - ], - "timeRange": "twilight" + "#cobblemon:is_snowy_forest" + ] + } + }, + { + "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 2e0211fc5a..561272416c 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,20 +12,48 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "31-50", - "weight": 0.06, + "level": "25-51", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest" - ], - "timeRange": "twilight" + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ] }, "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", @@ -36,14 +64,36 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "31-50", - "weight": 0.06, + "level": "25-51", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 2.5, + "condition": { + "timeRange": "twilight" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy" - ], - "timeRange": "twilight" + "#cobblemon:is_snowy_forest" + ] + } + }, + { + "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 35ac90f95e..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 @@ -12,8 +12,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-27", + "level": "16-27", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -30,8 +36,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-27", + "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 93671cdc0c..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 @@ -12,8 +12,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-43", + "level": "22-44", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -30,8 +36,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-43", + "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 dc9ef2f131..f14bf4519f 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,12 +38,18 @@ "id": "zubat-2", "pokemon": "zubat", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "5-24", + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "weight": 9.0, "condition": { "canSeeSky": false, @@ -53,7 +59,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -68,6 +74,12 @@ "bucket": "uncommon", "level": "5-24", "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -76,7 +88,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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 33e408f779..440fc95c4a 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,13 +38,19 @@ "id": "golbat-2", "pokemon": "golbat", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "22-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -53,7 +59,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -68,6 +74,12 @@ "bucket": "uncommon", "level": "22-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -76,7 +88,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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 49669d3768..f0bc7442bb 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,19 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-32", + "level": "7-32", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_jungle" - ], - "timeRange": "night" + ] } }, { @@ -30,15 +35,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "4-32", - "weight": 9.0, + "bucket": "common", + "level": "7-32", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" - ], - "timeRange": "night" + ] } }, { @@ -49,15 +59,21 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "4-32", - "weight": 9.0, + "bucket": "common", + "level": "7-32", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_savanna" - ], - "timeRange": "night" + "#cobblemon:is_savanna", + "#cobblemon:is_tropical_island" + ] } } ] 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..b8d68156b1 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,19 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "21-39", + "level": "21-40", "weight": 0.9, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_jungle" - ], - "timeRange": "night" + ] } }, { @@ -30,15 +35,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "21-39", - "weight": 0.9, + "bucket": "common", + "level": "21-40", + "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" - ], - "timeRange": "night" + ] } }, { @@ -49,15 +59,21 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "21-39", - "weight": 0.9, + "bucket": "common", + "level": "21-40", + "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_savanna" - ], - "timeRange": "night" + "#cobblemon:is_savanna", + "#cobblemon:is_tropical_island" + ] } } ] 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..ea17915bc4 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,13 +50,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "40-49", - "weight": 0.1, + "bucket": "common", + "level": "35-49", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_savanna" + "#cobblemon:is_savanna", + "#cobblemon:is_tropical_island" ], "timeRange": "night" } 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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "11-28", + "level": "4-29", "weight": 9.0, "condition": { "canSeeSky": false, @@ -30,13 +30,35 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "11-28", + "level": "4-29", "weight": 9.0, "condition": { "biomes": [ "#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 d102d059a7..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "24-40", + "level": "24-41", "weight": 1.0, "condition": { "canSeeSky": false, @@ -30,13 +30,35 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "24-40", + "level": "24-41", "weight": 1.0, "condition": { "biomes": [ "#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/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..92a4a3d5ca 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, @@ -22,7 +22,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..b46dfbf02b 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, @@ -22,7 +22,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..b233e35927 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,24 +8,256 @@ "pokemon": "meowth", "presets": [ "natural", - "urban" + "urban" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "12-29", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "meowth-2", + "pokemon": "meowth", + "presets": [ + "natural", + "village" + ], + "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_overworld" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing", + "#cobblemon:is_taiga" + ] + } + }, + { + "id": "meowth-3", + "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "meowth-4", + "pokemon": "meowth", + "presets": [ + "natural", + "village" + ], + "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" + ] + } + }, + { + "id": "meowth-alolan-1", + "pokemon": "meowth alolan", + "presets": [ + "natural", + "illager" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "meowth-alolan-2", + "pokemon": "meowth alolan", + "presets": [ + "natural", + "illager" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "meowth-alolan-3", + "pokemon": "meowth alolan", + "presets": [ + "illager" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "4-29", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" + ], + "minY": 62 + } + }, + { + "id": "meowth-galarian-1", + "pokemon": "meowth galarian", + "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_freezing", + "#cobblemon:is_taiga" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "meowth-galarian-2", + "pokemon": "meowth galarian", + "presets": [ + "natural", + "village" + ], + "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_freezing", + "#cobblemon:is_taiga" ] } } 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..0eb256999d 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,25 +8,200 @@ "pokemon": "persian", "presets": [ "natural", - "urban" + "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_overworld" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing", + "#cobblemon:is_taiga" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "persian-2", + "pokemon": "persian", + "presets": [ + "natural", + "village" + ], + "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_overworld" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing", + "#cobblemon:is_taiga" + ] + } + }, + { + "id": "persian-3", + "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "persian-4", + "pokemon": "persian", + "presets": [ + "natural", + "village" + ], + "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" + ] + } + }, + { + "id": "persian-alolan-1", + "pokemon": "persian alolan", + "presets": [ + "natural", + "illager" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-44", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "persian-alolan-2", + "pokemon": "persian alolan", + "presets": [ + "natural", + "illager" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-44", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "persian-alolan-3", + "pokemon": "persian alolan", + "presets": [ + "illager" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", "level": "28-44", - "weight": 1.0, + "weight": 0.6, "condition": { - "canSeeSky": true, + "canSeeSky": false, "biomes": [ - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" ], - "timeRange": "night", - "isRaining": false - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] + "minY": 62 } } ] 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..2703627944 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,22 +12,45 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "12-35", - "weight": 5.94, + "bucket": "common", + "level": "10-35", + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest", - "#cobblemon:is_grassland", - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" - ], - "timeRange": "day" + "#cobblemon:is_overworld" + ] }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_desert" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "growlithe-2", + "pokemon": "growlithe", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-35", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#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 be18465d9e..6b607a4d7e 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,27 +7,50 @@ "id": "arcanine-1", "pokemon": "arcanine", "presets": [ - "urban", - "natural" + "natural", + "urban" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "36-55", - "weight": 0.06, + "bucket": "common", + "level": "30-56", + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_forest", - "#cobblemon:is_grassland", - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" - ], - "timeRange": "day" + "#cobblemon:is_overworld" + ] }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_desert" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "arcanine-2", + "pokemon": "arcanine", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-56", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_desert" ] } } 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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "5-31", + "level": "6-31", "weight": 9.0, "condition": { "canSeeSky": true, @@ -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 4b4e970706..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "41-50", + "level": "35-50", "weight": 0.1, "condition": { "canSeeSky": true, @@ -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 9e055fb870..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-30", + "level": "6-31", "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-40", + "level": "28-41", "weight": 0.54, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", + "level": "36-51", "weight": 0.06, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..77665d37d7 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_ocean" ], - "maxHeight": 52 + "maxY": 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" - ] + "#cobblemon:is_ocean" + ], + "maxY": 48 }, "anticondition": { "biomes": [ - "#minecraft:is_deep_ocean" + "#cobblemon:is_deep_ocean" ] } } 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..d7d188c78f 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_ocean" ], - "maxHeight": 52 + "maxY": 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" - ] + "#cobblemon:is_ocean" + ], + "maxY": 48 }, "anticondition": { "biomes": [ - "#minecraft:is_deep_ocean" + "#cobblemon:is_deep_ocean" ] } } 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..1562d8c04e 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,12 +7,13 @@ "id": "geodude-1", "pokemon": "geodude", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, @@ -25,12 +26,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, @@ -40,7 +41,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..83ca76cde4 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", @@ -25,7 +26,7 @@ "id": "graveler-2", "pokemon": "graveler", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -40,7 +41,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..6e8c522a75 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,12 +7,13 @@ "id": "golem-1", "pokemon": "golem", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "40-49", + "level": "34-50", "weight": 0.1, "condition": { "canSeeSky": true, @@ -25,12 +26,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, @@ -40,7 +41,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..94217adffb 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,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-41", + "level": "16-41", "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" ], - "timeRange": "day", "isRaining": false } }, @@ -31,12 +36,39 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "20-41", + "bucket": "common", + "level": "16-41", "weight": 5.4, "condition": { "biomes": [ - "minecraft:nether_wastes" + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" + ] + } + }, + { + "id": "ponyta-galarian-1", + "pokemon": "ponyta galarian", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-41", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical" ] } } 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..83da441241 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,12 +14,17 @@ "bucket": "uncommon", "level": "40-50", "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_grassland" ], - "timeRange": "day", "isRaining": false } }, @@ -31,12 +36,39 @@ ], "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" + ] + } + }, + { + "id": "rapidash-galarian-1", + "pokemon": "rapidash galarian", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "40-50", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_magical" ] } } 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..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 @@ -12,12 +12,12 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-31", + "level": "7-32", "weight": 5.4, "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/0081_magnemite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json index c80f6de030..cc633755fa 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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-32", - "weight": 1.8, + "level": "8-33", + "weight": 9.0, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -21,7 +21,31 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..be42de3ffc 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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "30-46", - "weight": 0.18, + "level": "30-47", + "weight": 0.9, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -21,7 +21,31 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..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 @@ -8,25 +8,64 @@ "pokemon": "farfetchd", "presets": [ "natural", - "treetop" + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", - "bucket": "rare", - "level": "15-38", + "bucket": "uncommon", + "level": "13-38", "weight": 10.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" ], - "timeRange": "day" + "neededNearbyBlocks": [ + "#minecraft:water" + ] }, "anticondition": { "biomes": [ "#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/0084_doduo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json index 7e74acab82..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-31", + "level": "6-31", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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,12 +14,17 @@ "bucket": "common", "level": "31-47", "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "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..623f9287e1 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,17 +7,18 @@ "id": "seel-1", "pokemon": "seel", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "11-32", + "level": "8-33", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -30,12 +31,12 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "11-32", + "level": "8-33", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } } 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..2dcbefc301 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,17 +7,18 @@ "id": "dewgong-1", "pokemon": "dewgong", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "34-47", + "level": "34-48", "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -30,12 +31,12 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "34-47", + "level": "34-48", "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } } 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..2199cc6e3c 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,97 @@ "id": "grimer-1", "pokemon": "grimer", "presets": [ - "natural" + "water_surface" ], "type": "pokemon", - "context": "grounded", + "context": "surface", "bucket": "common", - "level": "15-32", + "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "grimer-3", + "pokemon": "grimer", + "presets": [ + "water_surface", + "village" + ], + "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-4", + "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..e960b172c5 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,97 @@ "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "muk-3", + "pokemon": "muk", + "presets": [ + "water_surface", + "village" + ], + "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-4", + "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 f30fa19ddd..ddbc2bc0d6 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,12 +12,35 @@ "type": "pokemon", "context": "seafloor", "bucket": "common", - "level": "12-30", - "weight": 9.9, + "level": "6-31", + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#minecraft:is_frigid" + ] + } + }, + { + "id": "shellder-2", + "pokemon": "shellder", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_ocean" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_cold_ocean" ] } } 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..d5b39be778 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,12 +12,35 @@ "type": "pokemon", "context": "seafloor", "bucket": "common", - "level": "31-52", - "weight": 0.1, + "level": "26-53", + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#minecraft:is_frigid" + ] + } + }, + { + "id": "cloyster-2", + "pokemon": "cloyster", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "common", + "level": "26-53", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_ocean" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_cold_ocean" ] } } 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..9c1e8767a8 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,17 +7,17 @@ "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, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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, @@ -41,7 +41,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..257787228d 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,17 +7,17 @@ "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, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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, @@ -41,7 +41,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..551fd28cf8 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,17 +7,17 @@ "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, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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, @@ -41,7 +41,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..1976466c0b 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,13 +7,13 @@ "id": "onix-1", "pokemon": "onix", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-38", - "weight": 5.94, + "level": "14-39", + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ @@ -22,7 +22,24 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..38f03f7e68 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,8 +13,34 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-33", - "weight": 5.4, + "level": "8-33", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_savanna" + ], + "timeRange": "night" + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "drowzee-2", + "pokemon": "drowzee", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "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..c05952f5a4 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,33 @@ "context": "grounded", "bucket": "common", "level": "26-48", - "weight": 0.6, + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_savanna" + ], + "timeRange": "night" + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "hypno-2", + "pokemon": "hypno", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-48", + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ 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..cefc8d09bc 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,15 +12,75 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "13-33", + "bucket": "common", + "level": "8-33", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "voltorb-2", + "pokemon": "voltorb", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" ] } + }, + { + "id": "voltorb-3", + "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" + ] + } } ] } \ No newline at end of file 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..a09c8fa8a1 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,15 +12,75 @@ ], "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "electrode-2", + "pokemon": "electrode", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-49", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" ] } + }, + { + "id": "electrode-3", + "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" + ] + } } ] } \ No newline at end of file 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..4c831fbcba 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,15 +11,34 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "10-32", - "weight": 1.98, + "bucket": "common", + "level": "8-33", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#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", + "#cobblemon:is_tropical_island" + ] + } } ] } \ 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 b010af0651..498bca1912 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,15 +11,34 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "33-53", - "weight": 0.02, + "bucket": "common", + "level": "28-53", + "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ "#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", + "#cobblemon:is_tropical_island" + ] + } } ] } \ 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 28fe4e8365..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,12 +7,13 @@ "id": "cubone-1", "pokemon": "cubone", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-32", + "level": "7-32", "weight": 1.8, "condition": { "canSeeSky": true, @@ -20,6 +21,25 @@ "#cobblemon:is_sandy" ] } + }, + { + "id": "cubone-alolan-1", + "pokemon": "cubone", + "presets": [ + "natural", + "wild" + ], + "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 9532535fdb..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,12 +7,13 @@ "id": "marowak-1", "pokemon": "marowak", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-42", + "level": "28-43", "weight": 0.2, "condition": { "canSeeSky": true, @@ -20,6 +21,25 @@ "#cobblemon:is_sandy" ] } + }, + { + "id": "marowak-alolan-1", + "pokemon": "marowak", + "presets": [ + "natural", + "wild" + ], + "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 4343476555..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-45", - "weight": 0.02, + "level": "20-46", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-45", - "weight": 0.02, + "level": "20-46", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "18-32", + "level": "14-39", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..e394523768 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,34 +7,71 @@ "id": "koffing-1", "pokemon": "koffing", "presets": [ - "natural" + "natural", + "urban" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-34", + "level": "9-34", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_swamp" + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" ] } }, { "id": "koffing-2", "pokemon": "koffing", + "presets": [ + "natural", + "village" + ], + "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_overworld" + ] + } + }, + { + "id": "koffing-3", + "pokemon": "koffing", "presets": [ "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-34", - "weight": 1.8, + "level": "9-34", + "weight": 9.0, "condition": { "biomes": [ - "#minecraft:is_nether" + "#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 a9e7f6506d..bf1be59933 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,23 +7,60 @@ "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" ] } }, { "id": "weezing-2", "pokemon": "weezing", + "presets": [ + "natural", + "village" + ], + "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_overworld" + ] + } + }, + { + "id": "weezing-3", + "pokemon": "weezing", "presets": [ "natural" ], @@ -31,10 +68,10 @@ "context": "grounded", "bucket": "common", "level": "35-49", - "weight": 0.2, + "weight": 1.0, "condition": { "biomes": [ - "#minecraft:is_nether" + "#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 5a77af4e7f..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,19 +7,25 @@ "id": "rhyhorn-1", "pokemon": "rhyhorn", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "15-34", + "level": "10-35", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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,19 +7,25 @@ "id": "rhydon-1", "pokemon": "rhydon", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "42-48", + "level": "42-49", "weight": 0.18, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..7dc565513d 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,49 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "4-45", + "level": "17-45", "weight": 0.9, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" - ], - "timeRange": "day" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "chansey-2", + "pokemon": "chansey", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "17-45", + "weight": 0.9, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] 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..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,12 +7,13 @@ "id": "tangela-1", "pokemon": "tangela", "presets": [ - "natural" + "natural", + "wild" ], "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..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,19 +7,25 @@ "id": "kangaskhan-1", "pokemon": "kangaskhan", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", "level": "24-49", "weight": 10.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "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..655cc9e181 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_ocean", + "#cobblemon:is_warm_ocean" ] } } 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..b5a90ac6dd 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_ocean", + "#cobblemon:is_warm_ocean" ] } } 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..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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-34", - "weight": 9.9, + "level": "9-34", + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ @@ -31,12 +31,18 @@ "type": "pokemon", "context": "seafloor", "bucket": "uncommon", - "level": "12-34", - "weight": 5.94, + "level": "9-34", + "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 3d726c962c..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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "35-52", - "weight": 0.1, + "level": "29-52", + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ @@ -31,12 +31,18 @@ "type": "pokemon", "context": "seafloor", "bucket": "uncommon", - "level": "35-52", - "weight": 0.06, + "level": "29-52", + "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 1233f9f4e9..71ecdf8712 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,19 +13,62 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "32-46", - "weight": 0.2, + "level": "26-46", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "mrmime-2", + "pokemon": "mrmime", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "26-46", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "mrmime-3", + "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 2569a3fcf0..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,13 +7,14 @@ "id": "scyther-1", "pokemon": "scyther", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "20-50", - "weight": 1.98, + "level": "25-50", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ @@ -23,7 +24,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } }, @@ -31,13 +33,14 @@ "id": "scyther-2", "pokemon": "scyther", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-50", - "weight": 1.98, + "level": "25-50", + "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 1e04bcbc8c..3f013c8f53 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,13 +13,48 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "30-45", - "weight": 0.2, + "level": "30-46", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" + "#cobblemon:is_freezing" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "jynx-2", + "pokemon": "jynx", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "30-46", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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 318c144d8c..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,35 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", - "level": "30-49", - "weight": 0.54, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ], - "isThundering": true - } - }, - { - "id": "electabuzz-2", - "pokemon": "electabuzz", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "30-49", + "bucket": "uncommon", + "level": "30-50", "weight": 0.18, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" - ], - "neededNearbyBlocks": [ - "minecraft:lightning_rod" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ] } } 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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "30-49", + "level": "30-50", "weight": 0.9, "condition": { "canSeeSky": true, @@ -21,7 +21,8 @@ ], "isRaining": false, "neededNearbyBlocks": [ - "minecraft:lava", "minecraft:flowing_lava" + "#minecraft:lava", + "minecraft:magma_block" ] }, "anticondition": { @@ -39,7 +40,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "30-49", + "level": "30-50", "weight": 0.9, "condition": { "canSeeSky": true, @@ -57,14 +58,13 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "30-49", + "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/0127_pinsir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json index e46810cef8..6e4562afce 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,19 +8,21 @@ "pokemon": "pinsir", "presets": [ "natural", - "treetop" + "treetop", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "20-50", + "level": "25-50", "weight": 10.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ], - "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..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 @@ -11,15 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "20-49", - "weight": 6.0, + "bucket": "common", + "level": "24-49", + "weight": 2.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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 @@ -19,9 +19,25 @@ "canSeeSky": true } }, - { + { "id": "magikarp-2", "pokemon": "magikarp", + "presets": [ + "freshwater", + "water_surface" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "1-20", + "weight": 1.98, + "condition": { + "canSeeSky": true + } + }, + { + "id": "magikarp-3", + "pokemon": "magikarp", "presets": [ "underwater" ], @@ -33,7 +49,25 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" + ] + } + }, + { + "id": "magikarp-4", + "pokemon": "magikarp", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "1-20", + "weight": 1.98, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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 9c22099305..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 @@ -3,23 +3,8 @@ "neededInstalledMods": [], "neededUninstalledMods": [], "spawns": [ - { - "id": "gyarados-1", - "pokemon": "gyarados", - "presets": [ - "water_surface", - "freshwater" - ], - "type": "pokemon", - "bucket": "uncommon", - "level": "20-54", - "weight": 2, - "condition": { - "canSeeSky": true - } - }, { - "id": "gyarados-2", + "id": "gyarados-1", "pokemon": "gyarados", "presets": [ "underwater", @@ -34,25 +19,23 @@ "canSeeSky": true } }, - { - "id": "gyarados-3", + { + "id": "gyarados-2", "pokemon": "gyarados", "presets": [ - "water_surface" + "water_surface", + "freshwater" ], "type": "pokemon", - "bucket": "uncommon", + "bucket": "common", "level": "20-54", - "weight": 2, + "weight": 0.02, "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] + "canSeeSky": true } }, { - "id": "gyarados-4", + "id": "gyarados-3", "pokemon": "gyarados", "presets": [ "underwater" @@ -65,7 +48,24 @@ "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" + ] + } + }, + { + "id": "gyarados-4", + "pokemon": "gyarados", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "bucket": "common", + "level": "20-54", + "weight": 0.02, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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 50aaf548af..cc79a64bbc 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,13 +10,35 @@ "water_surface" ], "type": "pokemon", - "bucket": "rare", - "level": "20-53", - "weight": 10, + "bucket": "uncommon", + "level": "29-54", + "weight": 2, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" + ] + } + }, + { + "id": "lapras-2", + "pokemon": "lapras", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "bucket": "rare", + "level": "29-54", + "weight": 2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_ocean" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_frozen_ocean" ] } } 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..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 @@ -12,9 +12,56 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "1-29", + "level": "4-29", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_ocean" + ] + } + }, + { + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_ocean" + ] + } + }, + { + "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 79ad391b31..727e446080 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,8 +12,75 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "5-32", + "level": "5-33", "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_ocean", + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "eevee-2", + "pokemon": "eevee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-33", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "eevee-4", + "pokemon": "eevee", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-33", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ @@ -22,20 +89,20 @@ } }, { - "id": "eevee-1", + "id": "eevee-5", "pokemon": "eevee", "presets": [ - "natural" + "woodland_mansion" ], "type": "pokemon", "context": "grounded", - "bucket": "rare", - "level": "5-32", - "weight": 10.0, + "bucket": "uncommon", + "level": "5-33", + "weight": 9.0, "condition": { - "canSeeSky": true, + "canSeeSky": false, "biomes": [ - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" ] } } 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..48bf919899 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,11 +29,72 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "33-52", + "level": "28-53", "weight": 1.0, "condition": { "canSeeSky": true } + }, + { + "id": "vaporeon-3", + "pokemon": "vaporeon", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "vaporeon-4", + "pokemon": "vaporeon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "vaporeon-5", + "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 99fe3a4243..7bf0955482 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, @@ -20,6 +20,67 @@ "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "jolteon-3", + "pokemon": "jolteon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "jolteon-4", + "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 0813164ddb..9f3beb126c 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, @@ -20,6 +20,67 @@ "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "flareon-3", + "pokemon": "flareon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "flareon-4", + "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/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..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 @@ -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, @@ -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 3ddb93e71f..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 @@ -7,7 +7,7 @@ "id": "dragonite-1", "pokemon": "dragonite", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -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/0152_chikorita.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json new file mode 100644 index 0000000000..b82d878482 --- /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-1", + "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..9a1fa4c33a --- /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-1", + "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..5498d5f45b --- /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-1", + "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..15e347f005 --- /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-1", + "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..d287790bdc --- /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-1", + "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_typhlosion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json new file mode 100644 index 0000000000..5b3331c94f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0157_typhlosion.json @@ -0,0 +1,30 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "typhlosion-1", + "pokemon": "typhlosion", + "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..4724451d58 --- /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-1", + "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-2", + "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..55eed4c54b --- /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-1", + "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-2", + "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..7c93496909 --- /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-1", + "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-2", + "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..327fd6c041 --- /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-1", + "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..e41d9aa473 --- /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-1", + "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..8f8ba65413 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json @@ -0,0 +1,121 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "spinarak-1", + "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-2", + "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_deep_dark" + ] + } + }, + { + "id": "spinarak-3", + "pokemon": "spinarak", + "presets": [ + "derelict" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "minY": 0, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "spinarak-4", + "pokemon": "spinarak", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "terralith:cave/infested_caves" + ] + } + }, + { + "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_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:cobweb" + ] + } + } + ] +} \ 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..253498a8e8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json @@ -0,0 +1,121 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ariados-1", + "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-2", + "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_deep_dark" + ] + } + }, + { + "id": "ariados-3", + "pokemon": "ariados", + "presets": [ + "derelict" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 0.6, + "condition": { + "canSeeSky": false, + "minY": 0, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "ariados-4", + "pokemon": "ariados", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-40", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "terralith:cave/infested_caves" + ] + } + }, + { + "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_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:cobweb" + ] + } + } + ] +} \ 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 12436924be..cb2fb16c4e 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,13 +38,19 @@ "id": "crobat-2", "pokemon": "crobat", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "common", "level": "45-53", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -53,7 +59,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -68,6 +74,12 @@ "bucket": "uncommon", "level": "45-53", "weight": 0.1, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "day" + } + }, "condition": { "canSeeSky": false, "biomes": [ @@ -76,7 +88,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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/0170_chinchou.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json new file mode 100644 index 0000000000..3137a93dc1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "chinchou-1", + "pokemon": "chinchou", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "8-33", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "maxY": 48, + "biomes": [ + "#cobblemon:is_deep_ocean" + ] + } + } + ] +} \ 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..503b592d99 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "lanturn-1", + "pokemon": "lanturn", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "27-46", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "maxY": 48, + "biomes": [ + "#cobblemon:is_deep_ocean" + ] + } + } + ] +} \ No newline at end of file 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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "4-20", + "level": "1-21", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "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..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 @@ -12,8 +12,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 9.0, + "weightMultiplier": { + "multiplier": 1.5, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -30,8 +36,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "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 501f2d58c7..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", - "level": "10-32", - "weight": 9.0, + "bucket": "common", + "level": "7-32", + "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/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/0182_bellossom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0182_bellossom.json index 5a8ee8bdd3..c3d66c1904 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,13 +49,14 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "40-49", - "weight": 0.05, + "bucket": "common", + "level": "35-49", + "weight": 0.02, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_savanna" + "#cobblemon:is_savanna", + "#cobblemon:is_tropical_island" ], "timeRange": "day" } 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/0190_aipom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json new file mode 100644 index 0000000000..042ef0010c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0190_aipom.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "aipom-1", + "pokemon": "aipom", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "11-36", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" + ] + } + } + ] +} \ 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..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 @@ -1,5 +1,5 @@ { - "enabled": true, + "enabled": "true", "neededInstalledMods": [], "neededUninstalledMods": [], "spawns": [ @@ -12,14 +12,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 9.0, "condition": { - "canSeeSky": true, + "canSeeSky": false, "biomes": [ - "#cobblemon:is_swamp" - ], - "isRaining": true + "#cobblemon:is_lush" + ] } }, { @@ -31,13 +30,183 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 9.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper-3", + "pokemon": "wooper", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "maxY": 62, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper-4", + "pokemon": "wooper", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "maxY": 62, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "wooper-5", + "pokemon": "wooper", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-21", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_swamp" + ], + "isRaining": true + }, + "anticondition": { + "biomes": [ + "minecraft:mangrove_swamp" + ] + } + }, + { + "id": "wooper-6", + "pokemon": "wooper", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "common", + "level": "1-21", + "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_swamp" ] + }, + "anticondition": { + "biomes": [ + "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" + ] } } ] 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 46e98d7772..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 @@ -1,5 +1,5 @@ { - "enabled": true, + "enabled": "true", "neededInstalledMods": [], "neededUninstalledMods": [], "spawns": [ @@ -15,11 +15,10 @@ "level": "20-43", "weight": 1.0, "condition": { - "canSeeSky": true, + "canSeeSky": false, "biomes": [ - "#cobblemon:is_swamp" - ], - "isRaining": true + "#cobblemon:is_lush" + ] } }, { @@ -33,10 +32,105 @@ "bucket": "common", "level": "20-43", "weight": 1.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire-3", + "pokemon": "quagsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "maxY": 62, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire-4", + "pokemon": "quagsire", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "maxY": 62, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_lush" + ] + } + }, + { + "id": "quagsire-5", + "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-6", + "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" ] } } 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..620a42cf9e 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, @@ -20,6 +20,67 @@ "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "espeon-3", + "pokemon": "espeon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "espeon-4", + "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 27655f10c6..c25ff68416 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, @@ -20,6 +20,67 @@ "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "umbreon-3", + "pokemon": "umbreon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "umbreon-4", + "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 c15683b675..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,18 +12,16 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "15-40", - "weight": 1.98, + "bucket": "common", + "level": "16-41", + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_sky", "#cobblemon:is_swamp", "#cobblemon:is_taiga" ], - "timeRange": "night", - "isRaining": false + "timeRange": "night" } }, { @@ -36,14 +34,39 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "15-40", - "weight": 1.98, + "level": "16-41", + "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" ], - "isRaining": false + "timeRange": "night" } } ] 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/0200_misdreavus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json index 6b139b54c5..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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "14-43", - "weight": 1.98, + "level": "19-44", + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ @@ -26,13 +26,13 @@ "id": "misdreavus-2", "pokemon": "misdreavus", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "14-43", - "weight": 5.94, + "bucket": "common", + "level": "19-44", + "weight": 1.8, "condition": { "canSeeSky": false, "biomes": [ @@ -49,9 +49,9 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "14-43", - "weight": 5.94, + "bucket": "common", + "level": "19-44", + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ @@ -69,8 +69,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "14-43", - "weight": 1.98, + "level": "19-44", + "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ @@ -88,11 +88,11 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "14-43", - "weight": 1.98, + "level": "19-44", + "weight": 5.4, "condition": { "biomes": [ - "minecraft:warped_forest" + "#cobblemon:is_nether_warped" ] } } 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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "31-46", + "level": "31-47", "weight": 1.0, "condition": { "canSeeSky": true, @@ -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/0207_gligar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json new file mode 100644 index 0000000000..844668747a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0207_gligar.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gligar-1", + "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-2", + "pokemon": "gligar", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-43", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_nether_mountain" + ] + } + } + ] +} \ 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 4303527da3..c39a4a2d8e 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,13 +7,13 @@ "id": "steelix-1", "pokemon": "steelix", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "39-51", - "weight": 0.06, + "level": "34-51", + "weight": 0.6, "condition": { "canSeeSky": false, "biomes": [ @@ -22,7 +22,24 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..9b3c33f499 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json @@ -0,0 +1,76 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "snubbull-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "snubbull-2", + "pokemon": "snubbull", + "presets": [ + "natural", + "village" + ], + "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-3", + "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..6682ce4b9a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json @@ -0,0 +1,76 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "granbull-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "granbull-2", + "pokemon": "granbull", + "presets": [ + "natural", + "village" + ], + "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-3", + "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/0212_scizor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0212_scizor.json index 563b3e39bc..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,13 +7,14 @@ "id": "scizor-1", "pokemon": "scizor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "50", - "weight": 0.02, + "level": "45-50", + "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ 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..0f514d41fb --- /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-1", + "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/0215_sneasel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0215_sneasel.json index a9234e0de9..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,13 +7,14 @@ "id": "sneasel-1", "pokemon": "sneasel", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-43", - "weight": 9.9, + "level": "18-43", + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ 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..b8e52c2cec --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "teddiursa-1", + "pokemon": "teddiursa", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_taiga" + ], + "minY": 48 + } + } + ] +} \ 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..71adbe4d5f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ursaring-1", + "pokemon": "ursaring", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-50", + "weight": 0.18, + "condition": { + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_taiga" + ], + "minY": 48 + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json index d7a90cd355..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 @@ -12,12 +12,12 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-25", - "weight": 1.8, + "level": "1-25", + "weight": 5.4, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt", + "#cobblemon:is_nether_wasteland" ] } }, @@ -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/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/0220_swinub.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0220_swinub.json index e6d1a5e511..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,12 +7,13 @@ "id": "swinub-1", "pokemon": "swinub", "presets": [ - "natural" + "natural", + "wild" ], "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/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/0230_kingdra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json index c0895dd1c5..8739ccb18b 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_ocean", + "#cobblemon:is_warm_ocean" + ] } } ] 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..252db4e9df --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0231_phanpy.json @@ -0,0 +1,57 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "phanpy-1", + "pokemon": "phanpy", + "presets": [ + "natural", + "wild" + ], + "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-2", + "pokemon": "phanpy", + "presets": [ + "natural", + "wild" + ], + "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..3a4be66b9d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0232_donphan.json @@ -0,0 +1,57 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "donphan-1", + "pokemon": "donphan", + "presets": [ + "natural", + "wild" + ], + "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-2", + "pokemon": "donphan", + "presets": [ + "natural", + "wild" + ], + "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/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..bc685dd4f8 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,17 +7,24 @@ "id": "stantler-1", "pokemon": "stantler", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "16-46", - "weight": 9.0, + "level": "22-47", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", "#cobblemon:is_tundra" ] } 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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "5-21", - "weight": 1.98, + "level": "1-21", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-45", - "weight": 0.02, + "level": "20-46", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..5a72198bb1 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,13 +13,48 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-30", - "weight": 1.8, + "level": "6-31", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy", - "#cobblemon:is_tundra" + "#cobblemon:is_freezing" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "smoochum-2", + "pokemon": "smoochum", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "6-31", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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 a9a35f958b..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,35 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", - "level": "12-36", - "weight": 5.4, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ], - "isThundering": true - } - }, - { - "id": "elekid-2", - "pokemon": "elekid", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "12-36", + "bucket": "uncommon", + "level": "11-36", "weight": 1.8, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" - ], - "neededNearbyBlocks": [ - "minecraft:lightning_rod" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ] } } 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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-36", + "level": "11-36", "weight": 9.0, "condition": { "canSeeSky": true, @@ -21,7 +21,8 @@ ], "isRaining": false, "neededNearbyBlocks": [ - "minecraft:lava", "minecraft:flowing_lava" + "#minecraft:lava", + "minecraft:magma_block" ] }, "anticondition": { @@ -39,7 +40,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-36", + "level": "11-36", "weight": 9.0, "condition": { "canSeeSky": true, @@ -57,14 +58,13 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "12-36", + "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/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..d5ae3ccdfb 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,49 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "46-54", + "level": "40-54", "weight": 0.1, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" - ], - "timeRange": "day" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "blissey-2", + "pokemon": "blissey", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "40-54", + "weight": 0.1, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] 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/0261_poochyena.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json new file mode 100644 index 0000000000..35dbdb132b --- /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-1", + "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-2", + "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..f7d0b789aa --- /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-1", + "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-2", + "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..a4885898fe --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json @@ -0,0 +1,56 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "zigzagoon-1", + "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" + ] + } + }, + { + "id": "zigzagoon-galarian-1", + "pokemon": "zigzagoon galarian", + "presets": [ + "natural", + "wild" + ], + "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" + ] + } + } + ] +} \ 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..9dc9eab040 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json @@ -0,0 +1,56 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "linoone-1", + "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" + ] + } + }, + { + "id": "linoone-galarian-1", + "pokemon": "linoone galarian", + "presets": [ + "natural", + "wild" + ], + "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" + ] + } + } + ] +} \ No newline at end of file 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/0276_taillow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json new file mode 100644 index 0000000000..2b75a84ce4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json @@ -0,0 +1,33 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "taillow-1", + "pokemon": "taillow", + "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..e1dd89535b --- /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-1", + "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..acdcfa3814 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0278_wingull.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "wingull-1", + "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", + "#cobblemon:is_tropical_island" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ 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..03dea202fa --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0279_pelipper.json @@ -0,0 +1,35 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "pelipper-1", + "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", + "#cobblemon:is_tropical_island" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ 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..ea6866b1a9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json @@ -0,0 +1,88 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ralts-1", + "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_forest" + ] + } + }, + { + "id": "ralts-2", + "pokemon": "ralts", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-20", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "ralts-3", + "pokemon": "ralts", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-20", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "ralts-4", + "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..abc6943f28 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json @@ -0,0 +1,88 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "kirlia-1", + "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_forest" + ] + } + }, + { + "id": "kirlia-2", + "pokemon": "kirlia", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-29", + "weight": 0.18, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "kirlia-3", + "pokemon": "kirlia", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-29", + "weight": 0.18, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "kirlia-4", + "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..98c1dd65e3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json @@ -0,0 +1,88 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gardevoir-1", + "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_forest" + ] + } + }, + { + "id": "gardevoir-2", + "pokemon": "gardevoir", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "gardevoir-3", + "pokemon": "gardevoir", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "gardevoir-4", + "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..bceffb181d --- /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-1", + "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..766c8cc7cb --- /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-1", + "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..83d953eea5 --- /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-1", + "pokemon": "nincada", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "minY": 32, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + } + ] +} \ 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..f826b2b7b0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json @@ -0,0 +1,33 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ninjask-1", + "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" + ] + } + } + ] +} \ 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..0d22cefd2b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json @@ -0,0 +1,33 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shedinja-1", + "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" + ] + } + } + ] +} \ No newline at end of file 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..7398e89791 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", + "level": "1-24", "weight": 9.0, "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } + }, + { + "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_deep_dark" + ] + } } ] } \ 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..ce12c3a3cf 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,7 +7,7 @@ "id": "loudred-1", "pokemon": "loudred", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -17,9 +17,33 @@ "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } + }, + { + "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_deep_dark" + ] + } } ] } \ 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..0bbb62492b 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,7 +7,7 @@ "id": "exploud-1", "pokemon": "exploud", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -17,9 +17,33 @@ "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } + }, + { + "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_deep_dark" + ] + } } ] } \ 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..ac45f6b1da 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,13 +7,13 @@ "id": "nosepass-1", "pokemon": "nosepass", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-37", - "weight": 5.94, + "level": "13-38", + "weight": 5.4, "condition": { "canSeeSky": false, "biomes": [ @@ -22,7 +22,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..92faf2101f 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,17 +7,17 @@ "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, "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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, @@ -40,7 +40,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..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", - "level": "10-40", - "weight": 5.0, + "bucket": "uncommon", + "level": "16-41", + "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 a197f25814..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", - "level": "10-40", - "weight": 5.0, + "bucket": "uncommon", + "level": "16-41", + "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/0313_volbeat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json new file mode 100644 index 0000000000..ddc049c058 --- /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-1", + "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-2", + "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..baa0ca1387 --- /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-1", + "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-2", + "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/0318_carvanha.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json index 1c276606ec..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 @@ -12,12 +12,12 @@ "type": "pokemon", "context": "submerged", "bucket": "uncommon", - "level": "12-30", + "level": "6-31", "weight": 9.0, "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/0320_wailmer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json index dfef720b99..7eb5131e73 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,12 +12,12 @@ "type": "pokemon", "context": "submerged", "bucket": "uncommon", - "level": "18-40", + "level": "15-40", "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_deep" + "#cobblemon:is_deep_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json index 3a67aa7a0e..e18d4bd337 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_deep" + "#cobblemon:is_deep_ocean" ] } } 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..4c425d2fd0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0322_numel.json @@ -0,0 +1,73 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "numel-1", + "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-2", + "pokemon": "numel", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" + ] + } + }, + { + "id": "numel-3", + "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..df26279e6d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0323_camerupt.json @@ -0,0 +1,73 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "camerupt-1", + "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-2", + "pokemon": "camerupt", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "33-46", + "weight": 0.6, + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_wasteland" + ] + } + }, + { + "id": "camerupt-3", + "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/0324_torkoal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0324_torkoal.json index 7100954410..d26a202eed 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,25 +11,8 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "20-47", - "weight": 10.0, - "condition": { - "biomes": [ - "minecraft:basalt_deltas" - ] - } - }, - { - "id": "torkoal-2", - "pokemon": "torkoal", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", "bucket": "common", - "level": "20-47", + "level": "22-47", "weight": 10.0, "condition": { "biomes": [ @@ -42,15 +25,15 @@ } }, { - "id": "torkoal-3", + "id": "torkoal-2", "pokemon": "torkoal", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-47", + "level": "22-47", "weight": 10.0, "condition": { "canSeeSky": false, @@ -63,11 +46,28 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss", + "#cobblemon:is_deep_dark", "#cobblemon:is_mountain", "#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/0327_spinda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0327_spinda.json index a5908038ca..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,12 +7,13 @@ "id": "spinda-1", "pokemon": "spinda", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 9.9, "condition": { "canSeeSky": true, @@ -26,12 +27,13 @@ "id": "spinda-2", "pokemon": "spinda special_spots=1 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, @@ -45,12 +47,13 @@ "id": "spinda-3", "pokemon": "spinda special_spots=2 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, @@ -64,12 +67,13 @@ "id": "spinda-4", "pokemon": "spinda special_spots=3 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "10-36", + "level": "11-36", "weight": 0.025, "condition": { "canSeeSky": true, @@ -83,12 +87,13 @@ "id": "spinda-5", "pokemon": "spinda special_spots=4 face_spots=none face_spots2=none", "presets": [ - "natural" + "natural", + "wild" ], "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/0331_cacnea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json new file mode 100644 index 0000000000..49db18cb0d --- /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-1", + "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..da77746106 --- /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-1", + "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..ec6f79ac09 --- /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-1", + "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..f2990e1e85 --- /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-1", + "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/0343_baltoy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json index 27278d0719..853fae2d73 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,22 +7,42 @@ "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, "biomes": [ "#cobblemon:is_sandy" - ] + ], + "minY": 0 }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..13ff6ffb4b 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", @@ -18,11 +18,31 @@ "canSeeSky": false, "biomes": [ "#cobblemon:is_sandy" - ] + ], + "minY": 0 }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..dcb565b962 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json @@ -0,0 +1,61 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "duskull-1", + "pokemon": "duskull", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 5.4, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "duskull-2", + "pokemon": "duskull", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_soul_sand" + ] + } + }, + { + "id": "duskull-3", + "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..ac431fbfcd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json @@ -0,0 +1,61 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dusclops-1", + "pokemon": "dusclops", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "37-46", + "weight": 0.54, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "dusclops-2", + "pokemon": "dusclops", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "37-46", + "weight": 0.9, + "condition": { + "biomes": [ + "#cobblemon:is_nether_soul_sand" + ] + } + }, + { + "id": "dusclops-3", + "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..477c593bac --- /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-1", + "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-2", + "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..914208b49c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clamperl.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "clamperl-1", + "pokemon": "clamperl", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "10-35", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "maxY": 48, + "biomes": [ + "#cobblemon:is_deep_ocean" + ] + } + }, + { + "id": "clamperl-2", + "pokemon": "clamperl", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "rare", + "level": "10-35", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_warm_ocean" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json new file mode 100644 index 0000000000..80b3230d64 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0367_huntail.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "huntail-1", + "pokemon": "huntail", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "maxY": 48, + "biomes": [ + "#cobblemon:is_deep_ocean" + ] + } + }, + { + "id": "huntail-2", + "pokemon": "huntail", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "rare", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_warm_ocean" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json new file mode 100644 index 0000000000..3416018db6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0368_gorebyss.json @@ -0,0 +1,44 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gorebyss-1", + "pokemon": "gorebyss", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "maxY": 48, + "biomes": [ + "#cobblemon:is_deep_ocean" + ] + } + }, + { + "id": "gorebyss-2", + "pokemon": "gorebyss", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "rare", + "level": "30-49", + "weight": 0.5, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_warm_ocean" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json new file mode 100644 index 0000000000..642a2860f2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json @@ -0,0 +1,67 @@ +{ + "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": { + "maxY": 48, + "biomes": [ + "#cobblemon:is_deep_ocean" + ] + } + }, + { + "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/0370_luvdisc.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0370_luvdisc.json index 38284fd2bd..d136773688 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,12 +12,12 @@ "type": "pokemon", "context": "submerged", "bucket": "common", - "level": "4-33", + "level": "8-33", "weight": 10.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_reef" + "#cobblemon:is_warm_ocean" ], "timeRange": "day" } 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/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/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 a6b21027ab..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 @@ -13,15 +13,17 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "14-40", + "level": "14-41", "weight": 0.9, "condition": { + "canSeeSky": true, "biomes": [ - "minecraft:crimson_forest" - ] + "#cobblemon:is_mountain" + ], + "isRaining": false } }, - { + { "id": "monferno-2", "pokemon": "monferno", "presets": [ @@ -31,14 +33,12 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "14-40", + "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/0393_piplup.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0393_piplup.json index 8d17d34eab..72db243abd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0393_piplup.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0393_piplup.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -35,7 +35,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } } 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..49986bd521 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,12 +12,12 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -30,12 +30,12 @@ "type": "pokemon", "context": "submerged", "bucket": "ultra-rare", - "level": "16-40", + "level": "16-41", "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0395_empoleon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0395_empoleon.json index 531a269426..e65065ead4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0395_empoleon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0395_empoleon.json @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -35,7 +35,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } } 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..f7797ec8b6 --- /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-1", + "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_forest", + "#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..09092e29cc --- /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-1", + "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_forest", + "#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..9a0fc2594d --- /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-1", + "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_forest", + "#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/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/0403_shinx.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json new file mode 100644 index 0000000000..92c2151d44 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0403_shinx.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shinx-1", + "pokemon": "shinx", + "presets": [ + "natural", + "wild" + ], + "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..806c8a807b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0404_luxio.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "luxio-1", + "pokemon": "luxio", + "presets": [ + "natural", + "wild" + ], + "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..e06883ed02 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0405_luxray.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "luxray-1", + "pokemon": "luxray", + "presets": [ + "natural", + "wild" + ], + "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..28cf1ae516 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "combee-1", + "pokemon": "combee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 1.98, + "weightMultiplier": { + "multiplier": 25.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:beehives" + ] + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ 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..b7c0b3a827 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json @@ -0,0 +1,40 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "vespiquen-1", + "pokemon": "vespiquen", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-47", + "weight": 0.02, + "weightMultiplier": { + "multiplier": 25.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:beehives" + ] + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file 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..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 @@ -13,8 +13,14 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "13-40", + "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/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..655d49d8de --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0424_ambipom.json @@ -0,0 +1,27 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ambipom-1", + "pokemon": "ambipom", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-48", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" + ] + } + } + ] +} \ No newline at end of file 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..748ee1d545 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,19 +7,21 @@ "id": "buneary-1", "pokemon": "buneary", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-35", - "weight": 9.9, + "level": "10-35", + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_hills", - "#cobblemon:is_snowy" + "#cobblemon:is_snowy_forest", + "#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..6a28c2e0ef 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,19 +7,21 @@ "id": "lopunny-1", "pokemon": "lopunny", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "36-48", - "weight": 0.1, + "level": "30-48", + "weight": 1.0, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_forest", "#cobblemon:is_hills", - "#cobblemon:is_snowy" + "#cobblemon:is_snowy_forest", + "#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..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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "44-49", - "weight": 0.02, + "level": "39-50", + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ @@ -26,13 +26,13 @@ "id": "mismagius-2", "pokemon": "mismagius", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "44-49", - "weight": 0.06, + "bucket": "common", + "level": "39-50", + "weight": 0.2, "condition": { "canSeeSky": false, "biomes": [ @@ -49,11 +49,11 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "44-49", - "weight": 0.06, + "bucket": "common", + "level": "39-50", + "weight": 0.6, "condition": { - "canSeeSky": true, + "canSeeSky": false, "biomes": [ "#cobblemon:is_spooky", "#cobblemon:is_swamp" @@ -69,8 +69,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "44-49", - "weight": 0.02, + "level": "39-50", + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ @@ -88,11 +88,11 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "44-49", - "weight": 0.02, + "level": "39-50", + "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 05055caeb9..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,18 +12,16 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "41-50", - "weight": 0.02, + "bucket": "common", + "level": "36-51", + "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_sky", "#cobblemon:is_swamp", "#cobblemon:is_taiga" ], - "timeRange": "night", - "isRaining": false + "timeRange": "night" } }, { @@ -36,14 +34,39 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "41-50", - "weight": 0.02, + "level": "36-51", + "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" ], - "isRaining": false + "timeRange": "night" } } ] 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/0439_mimejr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json index 566a8d8663..13031494ee 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,14 +13,39 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "12-31", - "weight": 1.8, + "level": "6-31", + "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_arid", - "#cobblemon:is_taiga", - "#cobblemon:is_temperate" + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "mimejr-2", + "pokemon": "mimejr", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" ] }, "anticondition": { @@ -28,6 +53,24 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "mimejr-3", + "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 ff05e2316c..faa6bfd1ed 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,49 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "4-22", + "level": "1-22", "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_overworld" - ], - "timeRange": "day" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "happiny-2", + "pokemon": "happiny", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-22", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json new file mode 100644 index 0000000000..10d2959dc9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json @@ -0,0 +1,67 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "chatot-1", + "pokemon": "chatot", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-41", + "weight": 10.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "day" + } + }, + { + "id": "chatot-2", + "pokemon": "chatot", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-41", + "weight": 6.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_tropical_island" + ], + "timeRange": "day" + } + }, + { + "id": "chatot-3", + "pokemon": "chatot", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-41", + "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/0442_spiritomb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json index cf861d549b..89a55e861e 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,39 +7,55 @@ "id": "spiritomb-1", "pokemon": "spiritomb", "presets": [ - "underground" + "ancient_city" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "25-48", - "weight": 20.0, + "level": "24-49", + "weight": 6.0, "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" - ], - "neededNearbyBlocks": [ - "minecraft:deepslate_bricks", - "minecraft:cracked_deepslate_bricks", - "minecraft:deepslate_tiles", - "minecraft:polished_deepslate" + "#cobblemon:is_deep_dark" ] } }, - { + { "id": "spiritomb-2", "pokemon": "spiritomb", - "presets": [ - "ruined_structures" + "presets": [ + "trail_ruins" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "25-48", + "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/0443_gible.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json index 0e9645ffc8..857bb29ed6 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,12 +7,13 @@ "id": "gible-1", "pokemon": "gible", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-30", + "level": "5-30", "weight": 5.4, "condition": { "biomes": [ @@ -24,12 +25,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, @@ -39,7 +40,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss", + "#cobblemon:is_deep_dark", "#cobblemon:is_mountain" ] } 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..091ae17dc5 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", @@ -24,7 +25,7 @@ "id": "gabite-2", "pokemon": "gabite", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -39,7 +40,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss", + "#cobblemon:is_deep_dark", "#cobblemon:is_mountain" ] } 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..d78afeb0bb 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", @@ -24,7 +25,7 @@ "id": "garchomp-2", "pokemon": "garchomp", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -39,7 +40,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss", + "#cobblemon:is_deep_dark", "#cobblemon:is_mountain" ] } 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..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,13 +7,20 @@ "id": "riolu-1", "pokemon": "riolu", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-28", + "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 dac564aa0a..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,13 +7,20 @@ "id": "lucario-1", "pokemon": "lucario", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "29-52", + "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 4ef02a7d0a..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,11 +6,15 @@ { "id": "weavile-1", "pokemon": "weavile", + "presets": [ + "natural", + "wild" + ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "44-51", - "weight": 0.1, + "level": "38-51", + "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 76dd5133dd..c76e11c255 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 @@ -12,8 +12,8 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "47-53", - "weight": 0.02, + "level": "42-54", + "weight": 0.1, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -21,7 +21,31 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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" ] } } 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..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 @@ -12,14 +12,19 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "33-51", + "level": "34-52", "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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,19 +7,25 @@ "id": "rhyperior-1", "pokemon": "rhyperior", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "49-53", + "level": "44-54", "weight": 0.02, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "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..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,12 +7,13 @@ "id": "tangrowth-1", "pokemon": "tangrowth", "presets": [ - "natural" + "natural", + "wild" ], "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..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,32 +11,20 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "common", - "level": "50-54", - "weight": 0.06, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ], - "isThundering": true - } - }, - { - "id": "electivire-2", - "pokemon": "electivire", - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "50-54", + "bucket": "uncommon", + "level": "45-54", "weight": 0.02, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_plains" - ], - "neededNearbyBlocks": [ - "minecraft:lightning_rod" + "#cobblemon:is_plains", + "#cobblemon:is_hills" ] } } 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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "50-54", + "level": "45-54", "weight": 0.1, "condition": { "canSeeSky": true, @@ -21,17 +21,26 @@ ], "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", - "level": "50-54", + "level": "45-54", "weight": 0.1, "condition": { "canSeeSky": true, @@ -44,16 +53,18 @@ { "id": "magmortar-3", "pokemon": "magmortar", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "50-54", + "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/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..3efd8da1be 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,69 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "leafeon-3", + "pokemon": "leafeon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "leafeon-4", + "pokemon": "leafeon", + "presets": [ + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.125, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_overworld" ] } } 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..6b194381b8 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, @@ -20,6 +20,67 @@ "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "glaceon-3", + "pokemon": "glaceon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "glaceon-4", + "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/0472_gliscor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json new file mode 100644 index 0000000000..06c7691a67 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0472_gliscor.json @@ -0,0 +1,44 @@ +{ + "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": { + "biomes": [ + "#cobblemon:is_nether_mountain" + ] + } + } + ] +} \ No newline at end of file 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..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,12 +7,13 @@ "id": "mamoswine-1", "pokemon": "mamoswine", "presets": [ - "natural" + "natural", + "wild" ], "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/0475_gallade.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json new file mode 100644 index 0000000000..4be99a1dad --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json @@ -0,0 +1,88 @@ +{ + "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_forest" + ] + } + }, + { + "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "gallade-3", + "pokemon": "gallade", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "30-52", + "weight": 0.01, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "gallade-4", + "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/0476_probopass.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0476_probopass.json index 1ee6677184..d9a8d01047 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,13 +7,13 @@ "id": "probopass-1", "pokemon": "probopass", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "38-52", - "weight": 0.06, + "level": "33-53", + "weight": 0.6, "condition": { "canSeeSky": false, "biomes": [ @@ -22,7 +22,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..b999631d7f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json @@ -0,0 +1,61 @@ +{ + "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_deep_dark" + ] + } + }, + { + "id": "dusknoir-2", + "pokemon": "dusknoir", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "41-53", + "weight": 0.1, + "condition": { + "biomes": [ + "#cobblemon:is_nether_soul_sand" + ] + } + }, + { + "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/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": [ @@ -14,30 +14,30 @@ "bucket": "ultra-rare", "level": "17-42", "weight": 0.9, - "condition": { - "biomes": [ - "minecraft:crimson_forest" - ] - } - }, - { - "id": "pignite-2", - "pokemon": "pignite", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "17-42", - "weight": 0.9, "condition": { "canSeeSky": true, "biomes": [ "#cobblemon:is_plains" - ], - "isRaining": false + ] } + }, + { + "id": "pignite-2", + "pokemon": "pignite", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "17-42", + "weight": 0.9, + "condition": { + "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/0504_patrat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0504_patrat.json new file mode 100644 index 0000000000..200cd827a3 --- /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-1", + "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..02b66a0325 --- /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-1", + "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..7e7bc1d711 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json @@ -0,0 +1,58 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "lillipup-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "lillipup-2", + "pokemon": "lillipup", + "presets": [ + "natural", + "village" + ], + "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..7753ca63a1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json @@ -0,0 +1,58 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "herdier-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "herdier-2", + "pokemon": "herdier", + "presets": [ + "natural", + "village" + ], + "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..41d6bd8b1f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json @@ -0,0 +1,58 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "stoutland-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "stoutland-2", + "pokemon": "stoutland", + "presets": [ + "natural", + "village" + ], + "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..4839cfe4d1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0519_pidove.json @@ -0,0 +1,81 @@ +{ + "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" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "pidove-3", + "pokemon": "pidove", + "presets": [ + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ] + } + } + ] +} \ 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..62591fd73e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0520_tranquill.json @@ -0,0 +1,81 @@ +{ + "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" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "tranquill-3", + "pokemon": "tranquill", + "presets": [ + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-36", + "weight": 0.9, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ] + } + } + ] +} \ 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..f0cb1d03b1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0521_unfezant.json @@ -0,0 +1,81 @@ +{ + "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" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "unfezant-3", + "pokemon": "unfezant", + "presets": [ + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-49", + "weight": 0.1, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_arid", + "#cobblemon:is_tundra" + ] + } + } + ] +} \ 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..5a36dfb877 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0524_roggenrola.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "roggenrola-1", + "pokemon": "roggenrola", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "maxY":0, + "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..75f7d07d43 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0525_boldore.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "boldore-1", + "pokemon": "boldore", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-39", + "weight": 0.9, + "condition": { + "canSeeSky": false, + "maxY":0, + "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..cc56a3c3ed --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0526_gigalith.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gigalith-1", + "pokemon": "gigalith", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-52", + "weight": 0.1, + "condition": { + "canSeeSky": false, + "maxY":0, + "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..34054ab4bf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0532_timburr.json @@ -0,0 +1,70 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "timburr-1", + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "timburr-2", + "pokemon": "timburr", + "presets": [ + "natural", + "village" + ], + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ] + } + } + ] +} \ 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..9aa12dea0c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0533_gurdurr.json @@ -0,0 +1,70 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "gurdurr-1", + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "gurdurr-2", + "pokemon": "gurdurr", + "presets": [ + "natural", + "village" + ], + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ] + } + } + ] +} \ 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..75fcee0e80 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0534_conkeldurr.json @@ -0,0 +1,70 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "conkeldurr-1", + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "conkeldurr-2", + "pokemon": "conkeldurr", + "presets": [ + "natural", + "village" + ], + "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" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_sandy" + ] + } + } + ] +} \ 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..31e36e5abd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0543_venipede.json @@ -0,0 +1,84 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "venipede-1", + "pokemon": "venipede", + "presets": [ + "natural", + "wild" + ], + "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", + "wild" + ], + "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", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-26", + "weight": 5.4, + "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 new file mode 100644 index 0000000000..7e2cdedf55 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0544_whirlipede.json @@ -0,0 +1,84 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "whirlipede-1", + "pokemon": "whirlipede", + "presets": [ + "natural", + "wild" + ], + "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", + "wild" + ], + "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", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-36", + "weight": 0.54, + "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 new file mode 100644 index 0000000000..f429564317 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0545_scolipede.json @@ -0,0 +1,84 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "scolipede-1", + "pokemon": "scolipede", + "presets": [ + "natural", + "wild" + ], + "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", + "wild" + ], + "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", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-49", + "weight": 0.06, + "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 new file mode 100644 index 0000000000..2006f8ac2f --- /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-1", + "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..0229ccece7 --- /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-1", + "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/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..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 @@ -7,36 +7,58 @@ "id": "sigilyph-1", "pokemon": "sigilyph", "presets": [ - "natural" + "natural", + "desert_pyramid", + "jungle_pyramid" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "20-49", - "weight": 2.0, + "level": "24-49", + "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": [ + "minecraft: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/0562_yamask.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json new file mode 100644 index 0000000000..de3d221ab7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0562_yamask.json @@ -0,0 +1,50 @@ +{ + "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, + "minY": 0, + "biomes": [ + "#cobblemon:is_desert" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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..058c3d1ff8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0563_cofagrigus.json @@ -0,0 +1,50 @@ +{ + "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, + "minY": 0, + "biomes": [ + "#cobblemon:is_desert" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "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/0585_deerling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json index 6c86fe32e5..065bf56f3f 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,13 +7,20 @@ "id": "deerling-1", "pokemon": "deerling", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "7-33", + "level": "9-34", "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -21,10 +28,9 @@ "#cobblemon:is_forest", "#cobblemon:is_hills", "#cobblemon:is_plains", - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", "#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..e36b299117 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,13 +7,20 @@ "id": "sawsbuck-1", "pokemon": "sawsbuck", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "34-47", + "level": "34-48", "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -21,10 +28,9 @@ "#cobblemon:is_forest", "#cobblemon:is_hills", "#cobblemon:is_plains", - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", "#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..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 @@ -13,8 +13,14 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "10-43", + "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/0595_joltik.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0595_joltik.json index b3789276da..6ccd85aa0a 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,8 +12,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "8-32", + "level": "7-32", "weight": 5.4, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isThundering": true + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -28,12 +34,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, @@ -43,7 +49,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..c0c6b8a3a7 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": [ @@ -28,7 +34,7 @@ "id": "galvantula-2", "pokemon": "galvantula", "presets": [ - "underground" + "natural" ], "type": "pokemon", "context": "grounded", @@ -43,7 +49,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } } 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..a95dae668f 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, @@ -26,7 +26,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..56c31a67ed 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": { @@ -26,7 +26,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..7746a0eb57 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": { @@ -26,7 +26,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_abyss" + "#cobblemon:is_deep_dark" ] } }, @@ -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..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 @@ -12,7 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "16-51", + "level": "27-52", "weight": 10.0, "condition": { "canSeeSky": true, @@ -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 bf8fb8dfef..de6d84715a 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,39 +7,54 @@ "id": "golett-1", "pokemon": "golett", "presets": [ - "underground" + "ancient_city" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-30", - "weight": 42.0, + "level": "5-30", + "weight": 9.0, "condition": { "canSeeSky": false, "biomes": [ - "#cobblemon:is_abyss" - ], - "neededNearbyBlocks": [ - "minecraft:deepslate_bricks", - "minecraft:cracked_deepslate_bricks", - "minecraft:deepslate_tiles", - "minecraft:polished_deepslate" + "#cobblemon:is_deep_dark" ] } }, - { + { "id": "golett-2", "pokemon": "golett", - "presets": [ - "ruined_structures" + "presets": [ + "trail_ruins" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "20-30", + "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 a66a9d6d32..60c89b264e 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": [ - "underground" + "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" + "#cobblemon:is_deep_dark" ] } }, - { + { "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/0626_bouffalant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json new file mode 100644 index 0000000000..95152c94c4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0626_bouffalant.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "bouffalant-1", + "pokemon": "bouffalant", + "presets": [ + "natural", + "wild" + ], + "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/0631_heatmor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0631_heatmor.json index 1d31155d51..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,20 @@ "id": "heatmor-1", "pokemon": "heatmor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "20-48", - "weight": 10.0, + "level": "23-48", + "weight": 6.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ @@ -26,16 +33,17 @@ "id": "heatmor-2", "pokemon": "heatmor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "20-48", - "weight": 10.0, + "bucket": "common", + "level": "23-48", + "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 f44dd18bd1..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 @@ -12,16 +12,17 @@ "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-2", "pokemon": "durant", "presets": [ @@ -29,12 +30,31 @@ ], "type": "pokemon", "context": "grounded", - "bucket": "uncommon", - "level": "16-48", + "bucket": "common", + "level": "23-48", + "weight": 10.0, + "condition": { + "canSeeSky": false, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_hills" + ] + } + }, + { + "id": "durant-3", + "pokemon": "durant", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "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/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/0659_bunnelby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0659_bunnelby.json new file mode 100644 index 0000000000..995d63f453 --- /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-1", + "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..a978fa3507 --- /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-1", + "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..56a5260372 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json @@ -0,0 +1,48 @@ +{ + "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": { + "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/0662_fletchinder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json new file mode 100644 index 0000000000..6630ec9164 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json @@ -0,0 +1,48 @@ +{ + "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": { + "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/0663_talonflame.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json new file mode 100644 index 0000000000..7ccd9f88b4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json @@ -0,0 +1,48 @@ +{ + "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": { + "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/0664_scatterbug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json new file mode 100644 index 0000000000..fefedc0424 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "scatterbug-1", + "pokemon": "scatterbug", + "presets": [ + "natural", + "foliage" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-20", + "weight": 7.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_plains", + "#cobblemon:is_savanna" + ] + } + } + ] +} \ 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..6a7a45d6d9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "spewpa-1", + "pokemon": "spewpa", + "presets": [ + "natural", + "foliage" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-21", + "weight": 3.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_plains", + "#cobblemon:is_savanna" + ] + } + } + ] +} \ 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..2f27fdbeec --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json @@ -0,0 +1,408 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "vivillon-highplains-1", + "pokemon": "vivillon vivillon_wings=high_plains", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_badlands" + ], + "timeRange": "day" + } + }, + { + "id": "vivillon-fancy-1", + "pokemon": "vivillon vivillon_wings=fancy", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:cherry_grove" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-ocean-1", + "pokemon": "vivillon vivillon_wings=ocean", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_warm_ocean" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-sandstorm-1", + "pokemon": "vivillon vivillon_wings=sandstorm", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_desert" + ], + "timeRange": "day" + } + }, + { + "id": "vivillon-meadow-1", + "pokemon": "vivillon vivillon_wings=meadow", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_floral" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-garden-1", + "pokemon": "vivillon vivillon_wings=garden", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-river-1", + "pokemon": "vivillon vivillon_wings=river", + "presets": [ + "natural", + "freshwater", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-polar-1", + "pokemon": "vivillon vivillon_wings=polar", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen_ocean" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-tundra-1", + "pokemon": "vivillon vivillon_wings=tundra", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_glacial", + "#cobblemon:is_snowy_forest", + "#cobblemon:is_tundra" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-jungle-1", + "pokemon": "vivillon vivillon_wings=jungle", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-monsoon-1", + "pokemon": "vivillon vivillon_wings=monsoon", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mountain" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-archipelago-1", + "pokemon": "vivillon vivillon_wings=archipelago", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-marine-1", + "pokemon": "vivillon vivillon_wings=marine", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-modern-1", + "pokemon": "vivillon vivillon_wings=modern", + "presets": [ + "natural", + "urban", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-continental-1", + "pokemon": "vivillon vivillon_wings=continental", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_plains" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-savanna-1", + "pokemon": "vivillon vivillon_wings=savanna", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_savanna" + ], + "timeRange": "day" + } + }, + { + "id": "vivillon-sun-1", + "pokemon": "vivillon vivillon_wings=sun", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_sky", + "#cobblemon:is_tropical_island", + "minecraft:sunflower_plains" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-elegant-1", + "pokemon": "vivillon vivillon_wings=elegant", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_magical", + "#cobblemon:is_spooky" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-icysnow-1", + "pokemon": "vivillon vivillon_wings=icysnow", + "presets": [ + "natural", + "flowers" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.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/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/0690_skrelp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json new file mode 100644 index 0000000000..03df9426b3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "skrelp-1", + "pokemon": "skrelp", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "7-32", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ], + "neededNearbyBlocks": [ + "minecraft:kelp_plant" + ] + } + } + ] +} \ 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..a186d2a998 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dragalge-1", + "pokemon": "dragalge", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "48-49", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#minecraft:is_ocean" + ], + "neededNearbyBlocks": [ + "minecraft:kelp_plant" + ] + } + } + ] +} \ No newline at end of file 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..2de497486e 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, @@ -26,6 +26,67 @@ "#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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "sylveon-3", + "pokemon": "sylveon", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-53", + "weight": 0.025, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "sylveon-4", + "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/0708_phantump.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json new file mode 100644 index 0000000000..0b451ce310 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0708_phantump.json @@ -0,0 +1,72 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "phantump-1", + "pokemon": "phantump", + "presets": [ + "natural", + "wild" + ], + "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", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#minecraft:is_nether" + ] + } + }, + { + "id": "phantump-3", + "pokemon": "phantump", + "presets": [ + "natural", + "wild" + ], + "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..a230df2069 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0709_trevenant.json @@ -0,0 +1,72 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "trevenant-1", + "pokemon": "trevenant", + "presets": [ + "natural", + "wild" + ], + "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", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-47", + "weight": 0.6, + "condition": { + "biomes": [ + "#cobblemon:is_nether_forest", + "#cobblemon:is_nether_warped" + ] + }, + "anticondition": { + "biomes": [ + "#minecraft:is_nether" + ] + } + }, + { + "id": "trevenant-3", + "pokemon": "trevenant", + "presets": [ + "natural", + "wild" + ], + "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/0710_pumpkaboo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0710_pumpkaboo.json index ad8396a2a6..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 @@ -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" ], @@ -25,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 f55c150488..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 @@ -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" ], @@ -24,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/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index 69633b6ce3..53bd156167 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,12 +12,12 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "9-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -29,12 +29,29 @@ ], "type": "pokemon", "bucket": "common", - "level": "9-30", + "level": "5-30", "weight": 9.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" + ] + } + }, + { + "id": "bergmite-3", + "pokemon": "bergmite", + "presets": [ + "natural" + ], + "type": "pokemon", + "bucket": "common", + "context": "grounded", + "level": "5-30", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" ] } } 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..cf139732ab 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 @@ -17,7 +17,7 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -34,7 +34,24 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" + ] + } + }, + { + "id": "avalugg-3", + "pokemon": "avalugg", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "37-51", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_frozen" ] } } 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..424bc72c83 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, @@ -24,7 +24,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_snowy" + "#cobblemon:is_snowy_forest" ] } } 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..5652b26cba 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, @@ -24,7 +24,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_snowy" + "#cobblemon:is_snowy_forest" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json index 42400fa13a..d8a76850a5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json @@ -24,7 +24,7 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_snowy" + "#cobblemon:is_snowy_forest" ] } } 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..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 @@ -12,25 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "5-16", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast" - ] - } - }, - { - "id": "popplio-2", - "pokemon": "popplio", - "presets": [ - "underwater" - ], - "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..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 @@ -12,25 +12,7 @@ "type": "pokemon", "context": "grounded", "bucket": "ultra-rare", - "level": "17-33", - "weight": 0.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast" - ] - } - }, - { - "id": "brionne-2", - "pokemon": "brionne", - "presets": [ - "underwater" - ], - "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/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/0739_crabrawler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0739_crabrawler.json new file mode 100644 index 0000000000..2b01923eca --- /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-1", + "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..eb6f9659b3 --- /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-1", + "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..e1b47940ae --- /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-1", + "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/0755_morelull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json index 4051a72a32..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 @@ -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, @@ -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 ca61b20ccd..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 @@ -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, @@ -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/0761_bounsweet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0761_bounsweet.json index b9af41883e..92889be9d6 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,12 +13,13 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-21", + "level": "1-21", "weight": 1.8, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0762_steenee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0762_steenee.json index 8fe7878549..23a95845fb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0762_steenee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0762_steenee.json @@ -17,7 +17,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0763_tsareena.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0763_tsareena.json index f622f4894c..a2a46a2150 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0763_tsareena.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0763_tsareena.json @@ -17,7 +17,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } 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..afc7a8a1df --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json @@ -0,0 +1,45 @@ +{ + "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", + "#cobblemon:is_tropical_island" + ] + } + }, + { + "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..751fabccdb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json @@ -0,0 +1,77 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "wimpod-1", + "pokemon": "wimpod", + "presets": [ + "natural", + "wild" + ], + "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, + "maxY":0, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:water" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "wimpod-3", + "pokemon": "wimpod", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "1-23", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "maxY":0, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + } + ] +} \ 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..bc9ff52f9e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json @@ -0,0 +1,77 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "golisopod-1", + "pokemon": "golisopod", + "presets": [ + "natural", + "wild" + ], + "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, + "maxY":0, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:water" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + }, + { + "id": "golisopod-3", + "pokemon": "golisopod", + "presets": [ + "underwater" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "30-53", + "weight": 1.0, + "condition": { + "canSeeSky": false, + "maxY":0, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_deep_dark" + ] + } + } + ] +} \ No newline at end of file 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..0be3a9185e 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,12 +12,12 @@ "type": "pokemon", "context": "grounded", "bucket": "uncommon", - "level": "15-41", + "level": "16-41", "weight": 6.0, "condition": { "canSeeSky": true, "biomes": [ - "#minecraft:is_beach" + "#cobblemon:is_beach" ] } }, @@ -28,19 +28,20 @@ "underwater" ], "type": "pokemon", - "context": "submerged", + "context": "seafloor", "bucket": "common", - "level": "15-41", + "level": "16-41", "weight": 2.0, "condition": { "canSeeSky": true, + "minY": 48, "biomes": [ - "#minecraft:is_ocean" + "#cobblemon:is_ocean" ] }, "anticondition": { "biomes": [ - "#cobblemon:is_reef" + "#cobblemon:is_warm_ocean" ] } }, @@ -51,14 +52,14 @@ "underwater" ], "type": "pokemon", - "context": "submerged", + "context": "seafloor", "bucket": "common", - "level": "15-41", + "level": "16-41", "weight": 10.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_reef" + "#cobblemon:is_warm_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 new file mode 100644 index 0000000000..57837c29aa --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "komala-1", + "pokemon": "komala", + "presets": [ + "natural", + "foliage", + "treetop", + "wild" + ], + "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/0778_mimikyu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0778_mimikyu.json index b58bfe97f7..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 @@ -12,13 +12,31 @@ "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "12-48", - "weight": 4.0, + "level": "23-48", + "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 344763b5a7..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": "20-52", - "weight": 2.0, + "level": "27-52", + "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/0810_grookey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0810_grookey.json index 70ceb36427..700de2ca97 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0810_grookey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0810_grookey.json @@ -18,7 +18,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0811_thwackey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0811_thwackey.json index 4665a318e3..6a221e8779 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0811_thwackey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0811_thwackey.json @@ -18,7 +18,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0812_rillaboom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0812_rillaboom.json index 4475562598..821d666351 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0812_rillaboom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0812_rillaboom.json @@ -17,7 +17,8 @@ "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" ] } } 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..ed5be00d7a --- /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-1", + "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..553701a8ab --- /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-1", + "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..ace993a5da --- /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-1", + "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/0831_wooloo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json index e0a1eb6d0a..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 @@ -12,8 +12,14 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "4-27", + "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/0835_yamper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json new file mode 100644 index 0000000000..2a5e16d00b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0835_yamper.json @@ -0,0 +1,70 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "yamper-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "yamper-2", + "pokemon": "yamper", + "presets": [ + "natural", + "village" + ], + "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..6c9629513d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0836_boltund.json @@ -0,0 +1,70 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "boltund-1", + "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" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "boltund-2", + "pokemon": "boltund", + "presets": [ + "natural", + "village" + ], + "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..cc8484142a --- /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-1", + "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..d9f262c068 --- /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-1", + "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/0850_sizzlipede.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0850_sizzlipede.json index ef3574acd4..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,17 +7,19 @@ "id": "sizzlipede-1", "pokemon": "sizzlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "6-31", "weight": 5.4, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_badlands" + "#cobblemon:is_badlands", + "#cobblemon:is_volcanic" ] } }, @@ -25,17 +27,35 @@ "id": "sizzlipede-2", "pokemon": "sizzlipede", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "10-30", + "level": "6-31", "weight": 5.4, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt" + ] + } + }, + { + "id": "sizzlipede-3", + "pokemon": "sizzlipede", + "presets": [ + "natural", + "wild" + ], + "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 467b2a2e8e..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,17 +7,19 @@ "id": "centiskorch-1", "pokemon": "centiskorch", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-52", + "level": "28-53", "weight": 0.6, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_badlands" + "#cobblemon:is_badlands", + "#cobblemon:is_volcanic" ] } }, @@ -25,17 +27,35 @@ "id": "centiskorch-2", "pokemon": "centiskorch", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-52", + "level": "28-53", "weight": 0.6, "condition": { "biomes": [ - "minecraft:basalt_deltas", - "minecraft:nether_wastes" + "#cobblemon:is_nether_basalt" + ] + } + }, + { + "id": "centiskorch-3", + "pokemon": "centiskorch", + "presets": [ + "natural", + "wild" + ], + "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/0862_obstagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json new file mode 100644 index 0000000000..0cd8724592 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0862_obstagoon.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "obstagoon-1", + "pokemon": "obstagoon", + "presets": [ + "natural", + "wild" + ], + "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..cdb357f6f6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0863_perrserker.json @@ -0,0 +1,64 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "perrserker-1", + "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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "perrserker-2", + "pokemon": "perrserker", + "presets": [ + "natural", + "village" + ], + "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..f644372e95 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0865_sirfetchd.json @@ -0,0 +1,37 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "sirfetchd-1", + "pokemon": "sirfetchd", + "presets": [ + "natural", + "wild" + ], + "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" + ] + }, + "anticondition": { + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + } + ] +} \ No newline at end of file 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..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 @@ -9,8 +9,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "5-27", - "weight": 1.98, + "level": "2-27", + "weight": 9.0, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -19,6 +19,46 @@ "minecraft:cake" ] } + }, + { + "id": "milcery-2", + "pokemon": "milcery", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "2-27", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "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 67e4017305..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 @@ -9,8 +9,8 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "28-49", - "weight": 0.02, + "level": "22-50", + "weight": 1.0, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -19,6 +19,46 @@ "minecraft:cake" ] } + }, + { + "id": "alcremie-2", + "pokemon": "alcremie", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "22-50", + "weight": 0.2, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "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/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/0875_eiscue.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json index 02c534e3d7..05f7c29b16 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,12 +12,12 @@ "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "12-47", + "level": "22-47", "weight": 6.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } }, @@ -30,12 +30,12 @@ "type": "pokemon", "context": "surface", "bucket": "common", - "level": "12-47", + "level": "22-47", "weight": 6.0, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } } 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..1a738206e8 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,17 +7,24 @@ "id": "wyrdeer-1", "pokemon": "wyrdeer", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "common", - "level": "47-52", - "weight": 1.0, + "level": "42-53", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", "#cobblemon:is_tundra" ] } 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..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,13 +7,14 @@ "id": "kleavor-1", "pokemon": "kleavor", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "50", - "weight": 0.02, + "level": "45-50", + "weight": 0.2, "condition": { "canSeeSky": true, "biomes": [ @@ -23,7 +24,8 @@ }, "anticondition": { "biomes": [ - "#cobblemon:is_spooky" + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } } 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..9a9b5c1f4a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json @@ -0,0 +1,28 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ursaluna-1", + "pokemon": "ursaluna", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "45-55", + "weight": 0.02, + "condition": { + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_mountain", + "#cobblemon:is_taiga" + ], + "minY":48 + } + } + ] +} \ 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..3b6b65afc8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0906_sprigatito.json @@ -0,0 +1,48 @@ +{ + "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": { + "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 new file mode 100644 index 0000000000..e160bc6ada --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0907_floragato.json @@ -0,0 +1,48 @@ +{ + "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": { + "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/0908_meowscarada.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json new file mode 100644 index 0000000000..bd54812f01 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0908_meowscarada.json @@ -0,0 +1,48 @@ +{ + "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": { + "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 new file mode 100644 index 0000000000..be56d8d6f5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0909_fuecoco.json @@ -0,0 +1,42 @@ +{ + "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": { + "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 new file mode 100644 index 0000000000..3b56783000 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0910_crocalor.json @@ -0,0 +1,42 @@ +{ + "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": { + "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 new file mode 100644 index 0000000000..73d2a13af1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0911_skeledirge.json @@ -0,0 +1,42 @@ +{ + "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": { + "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 new file mode 100644 index 0000000000..8125d36e04 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0912_quaxly.json @@ -0,0 +1,23 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quaxly-1", + "pokemon": "quaxly", + "presets": [ + "natural", + "river" + ], + "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..01d45da3a2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0913_quaxwell.json @@ -0,0 +1,23 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quaxwell-1", + "pokemon": "quaxwell", + "presets": [ + "natural", + "river" + ], + "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_quaquaval.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json new file mode 100644 index 0000000000..6db8cab596 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0914_quaquaval.json @@ -0,0 +1,23 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "quaquaval-1", + "pokemon": "quaquaval", + "presets": [ + "natural", + "river" + ], + "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..69f9f7e374 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0915_lechonk.json @@ -0,0 +1,85 @@ +{ + "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" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:mushroom_fields" + ] + } + }, + { + "id": "lechonk-2", + "pokemon": "lechonk", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_fungus", + "#cobblemon:is_nether_crimson" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + } + }, + { + "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_oinkologne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json new file mode 100644 index 0000000000..477b81c606 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0916_oinkologne.json @@ -0,0 +1,79 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "oinkologne-1", + "pokemon": "oinkologne", + "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" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:mushroom_fields" + ] + } + }, + { + "id": "oinkologne-2", + "pokemon": "oinkologne", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-49", + "weight": 1.0, + "condition": { + "biomes": [ + "#cobblemon:is_nether_overgrowth", + "#cobblemon:is_nether_fungus", + "#cobblemon:is_nether_crimson" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_nether_warped" + ] + } + }, + { + "id": "oinkologne-3", + "pokemon": "oinkologne", + "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..cfb2dd385f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json @@ -0,0 +1,115 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tandemaus-1", + "pokemon": "tandemaus", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "tandemaus-2", + "pokemon": "tandemaus", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "tandemaus-3", + "pokemon": "tandemaus", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 5.4, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ] + } + }, + { + "id": "tandemaus-4", + "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..a911605624 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json @@ -0,0 +1,115 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "maushold-1", + "pokemon": "maushold", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-47", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ] + } + }, + { + "id": "maushold-2", + "pokemon": "maushold", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-47", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "maushold-3", + "pokemon": "maushold", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-47", + "weight": 0.6, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ] + } + }, + { + "id": "maushold-4", + "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..96dd1cd004 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0926_fidough.json @@ -0,0 +1,50 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "fidough-1", + "pokemon": "fidough", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "fidough-2", + "pokemon": "fidough", + "presets": [ + "natural", + "village" + ], + "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..897354aa72 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_dachsbun.json @@ -0,0 +1,50 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dachsbun-1", + "pokemon": "dachsbun", + "presets": [ + "natural", + "urban" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-48", + "weight": 1.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "dachsbun-2", + "pokemon": "dachsbun", + "presets": [ + "natural", + "village" + ], + "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..928f69a036 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0931_squawkabilly.json @@ -0,0 +1,104 @@ +{ + "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", + "#cobblemon:is_tropical_island" + ], + "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 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ], + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "squawkabilly-3", + "pokemon": "squawkabilly", + "presets": [ + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-42", + "weight": 6.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_sandy" + ] + } + }, + { + "id": "squawkabilly-4", + "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..29e8418f33 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0932_nacli.json @@ -0,0 +1,65 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "nacli-1", + "pokemon": "nacli", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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", + "wild" + ], + "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 new file mode 100644 index 0000000000..ec8f44d054 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0933_naclstack.json @@ -0,0 +1,65 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "naclstack-1", + "pokemon": "naclstack", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-36", + "weight": 0.54, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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", + "wild" + ], + "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 new file mode 100644 index 0000000000..cffe9a805c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0934_garganacl.json @@ -0,0 +1,65 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "garganacl-1", + "pokemon": "garganacl", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "38-50", + "weight": 0.06, + "condition": { + "canSeeSky": true, + "biomes": [ + "#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", + "wild" + ], + "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/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..e98689b0b5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0942_maschiff.json @@ -0,0 +1,88 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "maschiff-1", + "pokemon": "maschiff", + "presets": [ + "natural", + "pillager_outpost" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 9.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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "maschiff-3", + "pokemon": "maschiff", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "maschiff-4", + "pokemon": "maschiff", + "presets": [ + "natural", + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "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/0943_mabosstiff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json new file mode 100644 index 0000000000..7e17e6c6d1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0943_mabosstiff.json @@ -0,0 +1,88 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "mabosstiff-1", + "pokemon": "mabosstiff", + "presets": [ + "natural", + "pillager_outpost" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "weight": 1.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" + ] + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] + } + }, + { + "id": "mabosstiff-3", + "pokemon": "mabosstiff", + "presets": [ + "natural", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_overworld" + ] + } + }, + { + "id": "mabosstiff-4", + "pokemon": "mabosstiff", + "presets": [ + "natural", + "woodland_mansion" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-51", + "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/0944_shroodle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json new file mode 100644 index 0000000000..cdb2556ed9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0944_shroodle.json @@ -0,0 +1,29 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shroodle-1", + "pokemon": "shroodle", + "presets": [ + "natural", + "treetop", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" + ], + "timeRange": "night" + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..c439b04750 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0945_grafaiai.json @@ -0,0 +1,29 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "grafaiai-1", + "pokemon": "grafaiai", + "presets": [ + "natural", + "treetop", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "28-49", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_jungle", + "#cobblemon:is_tropical_island" + ], + "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..cb1aeac749 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0955_flittle.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "flittle-1", + "pokemon": "flittle", + "presets": [ + "natural", + "wild" + ], + "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..057f77814c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0956_espathra.json @@ -0,0 +1,32 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "espathra-1", + "pokemon": "espathra", + "presets": [ + "natural", + "wild" + ], + "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..45ae9fe4d3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tinkatink-1", + "pokemon": "tinkatink", + "presets": [ + "natural", + "wild" + ], + "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..28c742259b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tinkatuff-1", + "pokemon": "tinkatuff", + "presets": [ + "natural", + "wild" + ], + "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..061d3b2b08 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json @@ -0,0 +1,26 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "tinkaton-1", + "pokemon": "tinkaton", + "presets": [ + "natural", + "wild" + ], + "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..31ac755703 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0965_varoom.json @@ -0,0 +1,58 @@ +{ + "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" + ], + "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" + ] + } + } + ] +} \ 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..c552b3d46f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0966_revavroom.json @@ -0,0 +1,58 @@ +{ + "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" + ], + "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" + ] + } + } + ] +} \ 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..93126e53e2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0969_glimmet.json @@ -0,0 +1,46 @@ +{ + "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": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } + }, + { + "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..3c9b4a12d1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0970_glimmora.json @@ -0,0 +1,46 @@ +{ + "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": { + "biomes": [ + "#cobblemon:is_nether_quartz" + ], + "neededBaseBlocks": [ + "minecraft:quartz_block" + ] + } + }, + { + "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_cetoddle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json new file mode 100644 index 0000000000..9bfdff8761 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0974_cetoddle.json @@ -0,0 +1,46 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cetoddle-1", + "pokemon": "cetoddle", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 5.4, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen_ocean" + ] + } + }, + { + "id": "cetoddle-2", + "pokemon": "cetoddle", + "presets": [ + "natural", + "wild" + ], + "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..eca140742b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0975_cetitan.json @@ -0,0 +1,46 @@ +{ + "enabled": "true", + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "cetitan-1", + "pokemon": "cetitan", + "presets": [ + "natural", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "28-52", + "weight": 0.6, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_frozen_ocean" + ] + } + }, + { + "id": "cetitan-2", + "pokemon": "cetitan", + "presets": [ + "natural", + "wild" + ], + "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/0978_tatsugiri.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0978_tatsugiri.json index 2090719493..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,12 +7,13 @@ "id": "tatsugiri-1", "pokemon": "tatsugiri", "presets": [ - "natural" + "natural", + "wild" ], "type": "pokemon", "context": "grounded", "bucket": "rare", - "level": "17-47", + "level": "23-48", "weight": 10.0, "condition": { "canSeeSky": true, @@ -30,7 +31,7 @@ "type": "pokemon", "context": "submerged", "bucket": "rare", - "level": "17-47", + "level": "23-48", "weight": 10.0, "condition": { "canSeeSky": true, 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..4f4397f138 --- /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-1", + "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..51bf9567a1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json @@ -0,0 +1,82 @@ +{ + "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" + ] + } + }, + { + "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" + ] + } + }, + { + "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" + ] + } + } + ] +} \ 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..20db728821 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_warm_ocean" } ] }, @@ -336,7 +348,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_frozen" + "biomeCondition": "#cobblemon:is_frozen_ocean" } ] }, @@ -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_forest" + }, + { + "variant": "biome", + "biomeCondition": "#cobblemon:is_glacial" } ] }, diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_dense.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_dense.json index 8a75e3aa5f..5cc14a61df 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_dense.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_dense.json @@ -5,7 +5,7 @@ "#cobblemon:is_desert", "#cobblemon:is_forest", "#cobblemon:is_jungle", - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", "#cobblemon:is_swamp", "#cobblemon:is_taiga" ] diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_normal.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_normal.json index 2ce45b8312..74d0fd711e 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_normal.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_feature/apricorns_normal.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "#cobblemon:is_hills", - "#cobblemon:is_plains", - "#cobblemon:is_savanna" + "#cobblemon:is_grassland" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_ice_stone_normal.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_ice_stone_normal.json index 9983fecb0d..69aee69487 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_ice_stone_normal.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_ice_stone_normal.json @@ -2,7 +2,7 @@ "replace": false, "values": [ "#cobblemon:is_glacial", - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", "#cobblemon:is_tundra" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_leaf_stone_rare.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_leaf_stone_rare.json index 7863e50290..dc7a05ccc6 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_leaf_stone_rare.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_leaf_stone_rare.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "#cobblemon:is_swamp" + "#cobblemon:is_swamp", + "#cobblemon:is_tropical_island" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_sun_stone_rare.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_sun_stone_rare.json index c6843ce6be..cf2e70854c 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_sun_stone_rare.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_sun_stone_rare.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "#cobblemon:is_desert" + "#cobblemon:is_desert", + "#cobblemon:is_tropical_island" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_normal.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_normal.json index 6802fe4539..5dce46e1eb 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_normal.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_normal.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "#minecraft:is_ocean", - "#cobblemon:is_river", - "#cobblemon:is_swamp" + "#cobblemon:is_freshwater" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_rare.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_rare.json index 9070fbdea3..4ed93eb460 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_rare.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_ore/ore_water_stone_rare.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#cobblemon:is_jungle", - "#cobblemon:is_thermal" + "#cobblemon:is_thermal", + "#cobblemon:is_tropical_island" ] } \ No newline at end of file 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..ab56975607 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 @@ -2,13 +2,45 @@ "replace": false, "values": [ "#cobblemon:is_arid", - "#cobblemon:is_frigid", + "#cobblemon:is_cold_ocean", "#cobblemon:is_mountain", "#cobblemon:is_mushroom", "#cobblemon:is_taiga", { "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..4b26e56dd4 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 @@ -3,6 +3,10 @@ "values": [ "#minecraft:is_badlands", { + "id": "#c:mesa", + "required": false + }, + { "id": "terralith:ashen_savanna", "required": false }, @@ -17,6 +21,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..92606fe356 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 @@ -4,6 +4,18 @@ "minecraft:dripstone_caves", "minecraft:lush_caves", { + "id": "#c:caves", + "required": false + }, + { + "id": "#c:underground", + "required": false + }, + { + "id": "#forge:is_underground", + "required": false + }, + { "id": "terralith:cave/andesite_caves", "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..8967b09604 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 @@ -4,6 +4,10 @@ "#minecraft:is_beach", "minecraft:stony_shore", { + "id": "#c:stony_shores", + "required": false + }, + { "id": "terralith:basalt_cliffs", "required": false }, @@ -14,6 +18,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..ce2e177d95 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 @@ -2,13 +2,25 @@ "replace": false, "values": [ "#cobblemon:is_freezing", - "#cobblemon:is_frigid", + "#cobblemon:is_cold_ocean", "#cobblemon:is_peak", "#cobblemon:is_taiga", "#cobblemon:is_tundra", { "id": "#byg:is_cold", "required": false + }, + { + "id": "#c:climate_cold", + "required": false + }, + { + "id": "#forge:is_cold/overworld", + "required": false + }, + { + "id": "wythers:berry_bog", + "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_cold_ocean.json similarity index 76% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frigid.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_cold_ocean.json index 389b64f9ef..297c20adad 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_cold_ocean.json @@ -3,6 +3,6 @@ "values": [ "minecraft:cold_ocean", "minecraft:deep_cold_ocean", - "#cobblemon:is_frozen" + "#cobblemon:is_frozen_ocean" ] } \ No newline at end of file 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 deleted file mode 100644 index f8aba67df7..0000000000 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:is_deep_ocean" - ] -} 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_deep_dark.json similarity index 74% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_abyss.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep_dark.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_deep_dark.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_deep_ocean.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep_ocean.json new file mode 100644 index 0000000000..57205f4e2e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_deep_ocean.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "#minecraft:is_deep_ocean", + { + "id": "#c:deep_ocean", + "required": false + }, + { + "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..5e9a9d332d 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 @@ -5,6 +5,14 @@ { "id": "#byg:is_desert", "required": false + }, + { + "id": "#c:desert", + "required": false + }, + { + "id": "#wythers:is_desert", + "required": false }, { "id": "terralith:ancient_sands", @@ -37,6 +45,30 @@ { "id": "terralith:sandstone_valley", "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 83b7549e6b..91d0fb009c 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,12 +1,21 @@ { "replace": false, "values": [ - "minecraft:flower_forest", + "minecraft:cherry_grove", + "minecraft:flower_forest", "minecraft:meadow", "minecraft:sunflower_plains", { "id": "#byg:is_floral", "required": false + }, + { + "id": "#c:floral", + "required": false + }, + { + "id": "#c:flower_forests", + "required": false }, { "id": "byg:amaranth_fields", @@ -55,6 +64,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 5bdb214fa6..e28f27f4ea 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,8 +1,17 @@ { "replace": false, "values": [ - "#minecraft:is_forest", + "#minecraft:is_forest", + "minecraft:cherry_grove", { + "id": "#c:flower_forests", + "required": false + }, + { + "id": "#c:tree_deciduous", + "required": false + }, + { "id": "terralith:alpha_islands", "required": false }, @@ -41,6 +50,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..5635a74251 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 @@ -6,10 +6,22 @@ "minecraft:snowy_beach", "minecraft:snowy_plains", "minecraft:snowy_slopes", - "#cobblemon:is_frozen", + "#cobblemon:is_frozen_ocean", "#cobblemon:is_glacial", - "#cobblemon:is_snowy", + "#cobblemon:is_snowy_forest", { + "id": "#byg:is_snowy", + "required": false + }, + { + "id": "#c:snowy", + "required": false + }, + { + "id": "#forge:is_snowy", + "required": false + }, + { "id": "byg:cardinal_tundra", "required": false }, @@ -28,6 +40,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_freshwater.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freshwater.json index 26a15c7a75..f3a0f22548 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freshwater.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_freshwater.json @@ -2,6 +2,18 @@ "replace": false, "values": [ "#cobblemon:is_river", - "#cobblemon:is_swamp" + "#cobblemon:is_swamp", + { + "id": "wythers:desert_lakes", + "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_frozen.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen.json deleted file mode 100644 index f84dcff93f..0000000000 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:deep_frozen_ocean", - "minecraft:frozen_ocean" - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen_ocean.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen_ocean.json new file mode 100644 index 0000000000..d6ec0a2557 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_frozen_ocean.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "minecraft:deep_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..3b13ad86a0 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 @@ -6,6 +6,10 @@ { "id": "#byg:is_icy", "required": false + }, + { + "id": "#c:icy", + "required": false }, { "id": "terralith:cave/frostfire_caves", @@ -18,6 +22,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..138c9ed065 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 @@ -4,6 +4,14 @@ "#minecraft:is_hill", "#cobblemon:is_highlands", { + "id": "#c:mountain_slope", + "required": false + }, + { + "id": "#forge:is_slope", + "required": false + }, + { "id": "terralith:blooming_valley", "required": false }, @@ -38,6 +46,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..5a380ec555 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 @@ -1,7 +1,8 @@ { "replace": false, "values": [ - "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island", + "minecraft:mushroom_fields", { "id": "byg:lush_stacks", "required": false @@ -21,6 +22,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 deleted file mode 100644 index f842e29d7c..0000000000 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:deep_lukewarm_ocean", - "minecraft:lukewarm_ocean" - ] -} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm_ocean.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm_ocean.json new file mode 100644 index 0000000000..e9d9d0ec37 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_lukewarm_ocean.json @@ -0,0 +1,19 @@ +{ + "replace": false, + "values": [ + "minecraft:deep_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..f6646b4c40 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 @@ -3,12 +3,36 @@ "values": [ "minecraft:lush_caves", { + "id": "forge:is_lush", + "required": false + }, + { "id": "byg:lush_stacks", "required": false }, { "id": "terralith:cave/underground_jungle", "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 } ] } 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..f521e5d719 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 @@ -3,7 +3,11 @@ "values": [ "#minecraft:is_mountain", "#cobblemon:is_hills", - { + { + "id": "#forge:is_mountain", + "required": false + }, + { "id": "terralith:stony_spires", "required": false }, @@ -18,6 +22,22 @@ { "id": "terralith:yosemite_cliffs", "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..344dfe8113 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 @@ -4,12 +4,28 @@ "minecraft:dark_forest", "minecraft:mushroom_fields", { + "id": "#c:mushroom", + "required": false + }, + { + "id": "#forge:is_mushroom", + "required": false + }, + { "id": "terralith:cave/fungal_caves", "required": false }, { "id": "terralith:mirage_isles", "required": false + }, + { + "id": "wythers:ancient_taiga", + "required": false + }, + { + "id": "wythers:deep_dark_incursion", + "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..58764cfd19 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_ocean.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "#minecraft:is_ocean", + "#cobblemon:is_coast", + "#cobblemon:is_cold_ocean", + "#cobblemon:is_deep_ocean", + "#cobblemon:is_frozen_ocean", + "#cobblemon:is_lukewarm_ocean", + "#cobblemon:is_warm_ocean" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_overworld.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_overworld.json index c894c5bbc9..f6bd889df2 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_overworld.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_overworld.json @@ -1,11 +1,11 @@ { "replace": false, "values": [ - "#cobblemon:is_deep", "#cobblemon:is_arid", "#cobblemon:is_cave", "#cobblemon:is_coast", "#cobblemon:is_cold", + "#cobblemon:is_deep_dark", "#cobblemon:is_floral", "#cobblemon:is_forest", "#cobblemon:is_freshwater", @@ -16,7 +16,7 @@ "#cobblemon:is_magical", "#cobblemon:is_mountain", "#cobblemon:is_mushroom", - "#minecraft:is_ocean", + "#cobblemon:is_ocean", "#minecraft:is_overworld", "#cobblemon:is_sky", "#cobblemon:is_spooky", 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..e485a31b93 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 @@ -6,6 +6,14 @@ "minecraft:snowy_slopes", "minecraft:stony_peaks", { + "id": "#c:mountain_peak", + "required": false + }, + { + "id": "#forge:is_peak", + "required": false + }, + { "id": "terralith:emerald_peaks", "required": false }, @@ -20,6 +28,14 @@ { "id": "terralith:windswept_spires", "required": false + }, + { + "id": "wythers:andesite_crags", + "required": false + }, + { + "id": "wythers:aspen_crags", + "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..b01eae1890 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 @@ -5,6 +5,14 @@ "minecraft:sunflower_plains", "#cobblemon:is_highlands", { + "id": "#c:plains", + "required": false + }, + { + "id": "#forge:is_plains", + "required": false + }, + { "id": "#byg:is_plain", "required": false }, @@ -19,6 +27,34 @@ { "id": "terralith:valley_clearing", "required": false + }, + { + "id": "wythers:berry_bog", + "required": false + }, + { + "id": "wythers:cool_forest_edge", + "required": false + }, + { + "id": "wythers:dry_tropical_grassland", + "required": false + }, + { + "id": "wythers:forest_edge", + "required": false + }, + { + "id": "wythers:spring_flower_fields", + "required": false + }, + { + "id": "terralith:subtropical_forest_edge", + "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..a93869dd24 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 @@ -2,9 +2,17 @@ "replace": false, "values": [ "minecraft:savanna_plateau", - { + { + "id": "#forge:is_plateau", + "required": false + }, + { "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_sandy.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_sandy.json index 0b68a63532..c9240f0c98 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_sandy.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_sandy.json @@ -6,6 +6,10 @@ { "id": "#byg:is_sandy", "required": false + }, + { + "id": "#forge:is_sandy", + "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_forest.json similarity index 67% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_snowy.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_snowy_forest.json index 55de3e95fc..bc9b7b76f8 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_forest.json @@ -3,10 +3,6 @@ "values": [ "minecraft:grove", "minecraft:snowy_taiga", - { - "id": "#byg:is_snowy", - "required": false - }, { "id": "terralith:alpha_islands_winter", "required": false @@ -38,6 +34,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..e100ed8aef 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 @@ -2,13 +2,33 @@ "replace": false, "values": [ "minecraft:dark_forest", - { + { "id": "#byg:is_spooky", "required": false + }, + { + "id": "#forge:is_spooky", + "required": false + }, + { + "id": "#wythers:is_dark_forest", + "required": false }, { "id": "byg:ebony_woods", "required": false + }, + { + "id": "wythers:ancient_taiga", + "required": false + }, + { + "id": "wythers:bayou", + "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..f7bcdac7eb 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 @@ -2,12 +2,20 @@ "replace": false, "values": [ "#cobblemon:is_floral", - "#cobblemon:is_lukewarm", + "#cobblemon:is_lukewarm_ocean", "#cobblemon:is_magical", "#cobblemon:is_plains", { "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_summer.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_summer.json index d5d514b202..def624368a 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_summer.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_summer.json @@ -4,7 +4,7 @@ "#cobblemon:is_forest", "#cobblemon:is_jungle", "#cobblemon:is_lush", - "#cobblemon:is_reef", + "#cobblemon:is_warm_ocean", "#cobblemon:is_swamp", { "id": "terralith:skylands_summer", 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..9e75789142 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 @@ -6,6 +6,18 @@ { "id": "#byg:is_swamp", "required": false + }, + { + "id": "#c:swamp", + "required": false + }, + { + "id": "#forge:is_swamp", + "required": false + }, + { + "id": "#wythers:is_swamp", + "required": false }, { "id": "terralith:ice_marsh", @@ -14,6 +26,10 @@ { "id": "terralith:orchid_swamp", "required": false + }, + { + "id": "wythers:billabong", + "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..43e0a7afa1 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 @@ -4,6 +4,14 @@ "#minecraft:is_taiga", "minecraft:grove", { + "id": "#c:tree_coniferous", + "required": false + }, + { + "id": "#forge:is_coniferous", + "required": false + }, + { "id": "terralith:alpine_grove", "required": false }, @@ -46,6 +54,90 @@ { "id": "terralith:wintry_lowlands", "required": false + }, + { + "id": "wythers:ancient_taiga", + "required": false + }, + { + "id": "wythers:birch_taiga", + "required": false + }, + { + "id": "wythers:boreal_forest_red", + "required": false + }, + { + "id": "wythers:boreal_forest_yellow", + "required": false + }, + { + "id": "wythers:cold_island", + "required": false + }, + { + "id": "wythers:deep_snowy_taiga", + "required": false + }, + { + "id": "wythers:fen", + "required": false + }, + { + "id": "wythers:flooded_temperate_rainforest", + "required": false + }, + { + "id": "wythers:forested_highlands", + "required": false + }, + { + "id": "wythers:huangshan_highlands", + "required": false + }, + { + "id": "wythers:jade_highlands", + "required": false + }, + { + "id": "wythers:larch_taiga", + "required": false + }, + { + "id": "wythers:old_growth_taiga_crags", + "required": false + }, + { + "id": "wythers:old_growth_taiga_swamp", + "required": false + }, + { + "id": "wythers:pine_barrens", + "required": false + }, + { + "id": "wythers:taiga_crags", + "required": false + }, + { + "id": "wythers:temperate_rainforest", + "required": false + }, + { + "id": "wythers:temperate_rainforest_crags", + "required": false + }, + { + "id": "wythers:thermal_taiga", + "required": false + }, + { + "id": "wythers:thermal_taiga_crags", + "required": false + }, + { + "id": "wythers:snowy_thermal_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_island.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tropical_island.json new file mode 100644 index 0000000000..7e1d9ae118 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_tropical_island.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..3075dc4e5d 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 @@ -4,6 +4,10 @@ "minecraft:ice_spikes", "minecraft:snowy_plains", { + "id": "#c:snowy_plains", + "required": false + }, + { "id": "byg:cardinal_tundra", "required": false }, @@ -26,6 +30,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_reef.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_warm_ocean.json similarity index 100% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_reef.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_warm_ocean.json 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 } ] }