diff --git a/CHANGELOG.md b/CHANGELOG.md index 28280e7af..3b52b4972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# 1.2.2 + +Additions +- Added Cobblemon 1.7.2 compatibility! +- Added an S icon to PC for Galaxy, Pastel, Shadow, Sketch, and Vintage Pokemon + +Changes +- Removed Ruby Rod recipe, Lake Guardian Crystals can be obtained from Cobblemon's fishing treasure loot table +- Changed Legendary Pokemon Wing items to stack at 64 +- Shifted most Legendaries to only spawn above ground + +Bug Fixes +- Fixed Galarian Articuno/Moltres/Zapdos summoning as Kantoian +- Fixed Mythicals not having 3 guaranteed 31 IVs +- Fixed Arceus/Silvally types not changing +- Fixed Terapagos abilities +- Fixed external transformations on shift right click, eg. mega +- Fixed Legendary item charging overflowing into all in inventory +- Fixed Rotom spawns +- Fixed some Pokemon not appearing as implemented for Pokedex completion +- Fixed Pokemon spawn context to spawnablePositionType + + # 1.2.1 Bug Fixes diff --git a/common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json b/common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json deleted file mode 100644 index 1854cbadb..000000000 --- a/common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_string": { - "conditions": { - "items": [ - { - "items": "minecraft:string" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "generations_core:ruby_rod" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_string" - ] - ], - "rewards": { - "recipes": [ - "generations_core:ruby_rod" - ] - } -} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json b/common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json deleted file mode 100644 index 6ddf8751c..000000000 --- a/common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "O": { - "item": "generations_core:orb" - }, - "R": { - "item": "generations_core:ruby" - }, - "S": { - "item": "minecraft:string" - } - }, - "pattern": [ - " R", - " RS", - "R O" - ], - "result": { - "count": 1, - "id": "generations_core:ruby_rod" - } -} \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt new file mode 100644 index 000000000..c5156412a --- /dev/null +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt @@ -0,0 +1,38 @@ +package generations.gg.generations.core.generationscore.common.client.screen + +import com.cobblemon.mod.common.api.gui.blitk +import generations.gg.generations.core.generationscore.common.GenerationsCore +import net.minecraft.client.gui.GuiGraphics + +class SpecialAspectIcon( + val x: Number, + val y: Number, + val centeredX: Boolean = false, + val small: Boolean = false, + val opacity: Float = 1F +) { + companion object { + private const val ICON_DIAMETER = 16 + private const val SCALE = 1F + private val iconResource = GenerationsCore.id("textures/gui/special_aspect_icon.png") + } + + fun render(context: GuiGraphics) { + val diameter = if (small) (ICON_DIAMETER / 2) else ICON_DIAMETER + val offsetX = if (centeredX) (((diameter / 2) * SCALE)) else 0F + + blitk( + matrixStack = context.pose(), + texture = iconResource, + x = (x.toFloat() - offsetX) / SCALE, + y = y.toFloat() / SCALE, + height = diameter, + width = diameter, + uOffset = 0F, + textureWidth = diameter, + textureHeight = diameter, + alpha = opacity, + scale = SCALE + ) + } +} \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java index 73f1cc1e0..ec4345ced 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java @@ -19,6 +19,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import generations.gg.generations.core.generationscore.common.client.screen.SpecialAspectIcon; +import java.util.Set; @Mixin(PCGUI.class) public abstract class PcGuiMixin extends Screen { @@ -39,6 +41,14 @@ public void renderThings(GuiGraphics context, int mouseX, int mouseY, float delt var y = (height - BASE_HEIGHT) / 2; new TeraTypeIcon(x + 6 + 1, y + 27 + 66 - 9 - 1, previewPokemon.getTeraType(), false, true, 1f).render(context); + if (generations$hasSpecialAspect(previewPokemon)) { + new SpecialAspectIcon(x + 62, y + 83, false, true, 1f).render(context); + } } } + @Unique + private boolean generations$hasSpecialAspect(Pokemon pokemon) { + Set pokemonAspectsString = pokemon.getAspects(); + return pokemonAspectsString.contains("vintage") || pokemonAspectsString.contains("pastel") || pokemonAspectsString.contains("galaxy") || pokemonAspectsString.contains("sketch") || pokemonAspectsString.contains("shadow"); + } } \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt index 17fbb93fb..1bd0ed59b 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt @@ -888,7 +888,7 @@ object GenerationsItems: ItemPlatformRegistry() { val DARK_STONE = register("dark_stone", { TaoTrioStoneItem(it.stacksTo(1).durability(100), LegendKeys.ZEKROM) }, LEGENDARY_ITEMS) val DRAGON_STONE = register("dragon_stone", { TaoTrioStoneItem(it.stacksTo(1).durability(100), LegendKeys.KYUREM) }, LEGENDARY_ITEMS) val RAINBOW_WING = register("rainbow_wing", { WingItem(it, "rainbow", ElementalTypes.FLYING, LegendKeys.HO_OH) }, LEGENDARY_ITEMS) - val SILVER_WING = register("silver_wing", { WingItem(it.stacksTo(1), "silver", ElementalTypes.FLYING, LegendKeys.LUGIA) }, LEGENDARY_ITEMS) + val SILVER_WING = register("silver_wing", { WingItem(it, "silver", ElementalTypes.FLYING, LegendKeys.LUGIA) }, LEGENDARY_ITEMS) val DARK_SOUL = register("dark_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val DRAGON_SOUL = register("dragon_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val MELODY_FLUTE = register("melody_flute", ::MelodyFluteItem, LEGENDARY_ITEMS) @@ -928,12 +928,12 @@ object GenerationsItems: ItemPlatformRegistry() { val REGIDRAGO_ORB = register("regidrago_orb", { RegiOrbItem(it, "regidrago") }, LEGENDARY_ITEMS) val REGIELEKI_ORB = register("regieleki_orb", { RegiOrbItem(it, "regieleki") }, LEGENDARY_ITEMS) val MAGMA_CRYSTAL = register("magma_crystal", { MagmaCrystal(it.stacksTo(1)) }, LEGENDARY_ITEMS) - val ICY_WING = register("icy_wing", { WingItem(it.stacksTo(1), "icy", ElementalTypes.ICE, LegendKeys.ARTICUNO) }, LEGENDARY_ITEMS) - val ELEGANT_WING = register("elegant_wing", { WingItem(it.stacksTo(1), "elegant", ElementalTypes.PSYCHIC, LegendKeys.GALARIAN_ARTICUNO) }, LEGENDARY_ITEMS) - val STATIC_WING = register("static_wing", { WingItem(it.stacksTo(1), "static", ElementalTypes.ELECTRIC, LegendKeys.ZAPDOS) }, LEGENDARY_ITEMS) - val BELLIGERENT_WING = register("belligerent_wing", { WingItem(it.stacksTo(1), "belligerent", ElementalTypes.FIGHTING, LegendKeys.GALARIAN_ZAPDOS) }, LEGENDARY_ITEMS) - val FIERY_WING = register("fiery_wing", { WingItem(it.stacksTo(1).fireResistant(), "fiery", ElementalTypes.FIRE, LegendKeys.MOLTRES) }, LEGENDARY_ITEMS) - val SINISTER_WING = register("sinister_wing", { WingItem(it.stacksTo(1), "sinister", ElementalTypes.DARK, LegendKeys.GALARIAN_MOLTRES) }, LEGENDARY_ITEMS) + val ICY_WING = register("icy_wing", { WingItem(it, "icy", ElementalTypes.ICE, LegendKeys.ARTICUNO) }, LEGENDARY_ITEMS) + val ELEGANT_WING = register("elegant_wing", { WingItem(it, "elegant", ElementalTypes.PSYCHIC, LegendKeys.GALARIAN_ARTICUNO) }, LEGENDARY_ITEMS) + val STATIC_WING = register("static_wing", { WingItem(it, "static", ElementalTypes.ELECTRIC, LegendKeys.ZAPDOS) }, LEGENDARY_ITEMS) + val BELLIGERENT_WING = register("belligerent_wing", { WingItem(it, "belligerent", ElementalTypes.FIGHTING, LegendKeys.GALARIAN_ZAPDOS) }, LEGENDARY_ITEMS) + val FIERY_WING = register("fiery_wing", { WingItem(it.fireResistant(), "fiery", ElementalTypes.FIRE, LegendKeys.MOLTRES) }, LEGENDARY_ITEMS) + val SINISTER_WING = register("sinister_wing", { WingItem(it, "sinister", ElementalTypes.DARK, LegendKeys.GALARIAN_MOLTRES) }, LEGENDARY_ITEMS) val MEW_DNA_FIBER = register("mew_dna_fiber", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val MEW_FOSSIL = register("mew_fossil", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val LIGHT_SOUL = register("light_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) diff --git a/common/src/main/resources/assets/generations_core/textures/gui/special_aspect_icon.png b/common/src/main/resources/assets/generations_core/textures/gui/special_aspect_icon.png new file mode 100644 index 000000000..69b7e189c Binary files /dev/null and b/common/src/main/resources/assets/generations_core/textures/gui/special_aspect_icon.png differ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json index 9916011ce..fcc8fd04b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "4-29", "weight": 6.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json index 28184275b..cf56953fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_jungle" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json index ba903bc8d..427f8745f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "5-24", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json index 1dd96b891..3b648d27e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "4-16", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json index 5205a660f..285b6e835 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "10-44", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json index af6dce7fc..5be246b65 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "4-16", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json index 84033ee05..71e3e324c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "10-44", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json index 0ba59c9dc..1de36e4b0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-29", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json index 4ea4a422d..7f7fb0789 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "16-55", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json index b8ac605ad..0925ec7a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-28", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json index 9d7b98dfe..9115ba28d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "26-55", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json index ce3c32097..c1f1328c9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-55", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json index 56661ede9..db2202ea8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-55", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json index 7c90f12ac..692ea8676 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "4-55", "weight": 5.94, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json index 64904e202..95dcbf8cf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_highlands" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json index 12b84e91c..607062e20 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "5-25", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json index 44d519d79..7d5f72798 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "20-50", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json index ba03e35d5..61689fbcc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "20-50", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json index 1e2a420f1..1835c49f9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json index 8b0836508..01fa0c8af 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-50", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json index cd0cea020..8c20cebf5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-24", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json index 00b7a7a60..9ddade9e1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "34-50", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json index d52a32072..9ce00190b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "4-40", "weight": 5.94, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json index 060c24300..b5afbccf4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "40-60", "weight": 5.94, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json new file mode 100644 index 000000000..d43bcfdca --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json @@ -0,0 +1,26 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "rotom-1", + "pokemon": "rotom", + "presets": [ + "natural" + ], + "type": "pokemon", + "spawnablePositionType": "grounded", + "bucket": "ultra-rare", + "level": "12-60", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ], + "timeRange": "night" + } + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json index 75c67a598..f7bd95488 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_forest" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json index 3a6d7e913..343f23141 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json index 61905b91a..4c81dc29d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json index a6baff220..934b0ce6e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json index 53deddb46..bc38472e6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "6-22", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json index eb5a3b187..d4ed1dcd0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "25-40", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json index 75d6b9b80..240b2981c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "36-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json index f1328b1c9..eaff411e8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json index 3958488ae..e1201f1d3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json index f9061e07b..0b0f0b68f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json index ed4a268c1..ad138474f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "52-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json index 32d9b1a1c..e43d54c41 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "6-54", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json index dcf9aa675..59809df7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "54-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json index 1c97bb4af..951c7cb22 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_mountain" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json index 16c066ec2..3d831ddc8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_badlands" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json index 38840a6c2..28d4173f6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json @@ -10,11 +10,14 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "timeRange": "day", "biomes": [ "#cobblemon:is_plains" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json index 5eaccc84f..c23191562 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_river" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json index 2b2e9b7d3..65197f344 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-40", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json index 78eb6eb69..076efa9f4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "35-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json index 35ff50396..adcb1539b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "8-40", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json index de03335c1..43d2bfb20 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "32-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json index 777d172a4..9d0b15321 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json index b33fad60e..9d496885a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "18-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json index a367f2949..8caca3efe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json index 2a8f3b479..6d83c95dc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "18-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json index 9a44c7a06..2dc7cd96b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json index 18af2e55b..ed4811c99 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "24-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json index 1be54b49a..5b77946eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "day", "biomes": [ "#cobblemon:is_taiga" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json index f86d070d3..f2c0b6337 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_taiga" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json index 6f6c0ed49..4ff79f77f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_mountain" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json index ed65ee966..b1b7214ed 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_peak" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json index 98dd6c746..980437f02 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "4-24", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json index 31b41f9dc..2151e78bf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "20-44", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json index a5a2b8596..242ddc445 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json index 9bf756094..1945e4f56 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json index bf2ce0abb..c2ff7c535 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-25", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json index 92a01837a..7cff95328 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json index 765cb7c4f..559c121e0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json index 49335e1cd..ae48c1e0e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json index 283b45a68..d8abfcd8c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json index b93d5c680..189b1b26d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json index 1e06d9856..962963362 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json index b7d4c28b5..259cb37a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json index 88dbb4fd6..eebac622e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json index e72ff8220..8b942f04e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json index 89699d39f..ae48c81f6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json index 346df5f20..8c2ee5e5b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json index 099663ac2..677296852 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json index 8fc1c0666..df624105d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json index bc1ce5f45..4027a959e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json index 10b68baca..71a71cb5b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_spooky" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json index a7288d97c..7ff0f1809 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json index dac8485ca..27d96ac71 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json index 4dc005056..9e73138eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_plateau" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json index 2a1362adc..5863a4a61 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.001, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json index 6b8a26232..94e652581 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "4-27", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json index 594cc985c..f50bbbfff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-38", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json index 28e64432d..5bbac99a0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json index a4800c7cb..4cf056d9b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "5-25", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json index 69f2232d0..5cc5a0cd8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "18-44", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json index df2664ada..aa4bb8f6f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "34-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json index b4a70ffeb..bf6513c2d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json index 00d28ac2b..271b89175 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json index c5d59ad7b..6e5ca5402 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json index 0c3ed08ac..e07eb5164 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "34-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json index bf0f7a4fd..916e19d83 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-20", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json index 9dd76af81..b15b2e299 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "5-20", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json index 5e881330b..551009de5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json index dd9700b20..810144c2f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json index 9525bac07..6a6f53f7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_spooky" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json index 6f0039ae8..59458c379 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_jungle" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json index 01eab8de3..5f9ddd6f9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "50-60", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_taiga" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json index 97128c73a..3bc1fe464 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "15-30", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json index dfb389909..58d9b4e70 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "24-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json index 6b2ec6b6f..7be7fb224 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "6-20", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json index 7703d4e75..f0931999f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "18-40", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json index 2cb0bcdea..dfd78d4e7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json index 7edd53b18..414b09ce6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "26-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json index 749af63f4..dfd05be85 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-55", "weight": 2.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json index 22516c75b..c693537c8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-40", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json index 97a15a473..285d85454 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json index aa3eb8339..8aa32fd89 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "52-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json index 4cc4d8c0e..7f1a89a98 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "15-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json index a12f3d5f6..ae7d68e6f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-42", "weight": 0.9, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json index da82c2a21..efe5a8b78 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "55-60", "weight": 0.1, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json index e5b21ad91..a6a82f552 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_badlands" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json index d022d783d..85ec07977 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_glacial" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json index 8b57d6ed8..5cc7cea2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json index 226aa303c..69afcdd6a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_volcanic" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json index ffca082bb..a8dd9d7aa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json index 9584f97f3..85ed44b4d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_jungle" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json index 74bfbdb3e..b9b77ffc4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_jungle" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json index 63505da11..2340e6128 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_swamp" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json index c289293cd..2061b44f1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "day", "biomes": [ "#cobblemon:is_jungle" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json index 051067657..ef1ef90eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json index 44450f0fe..dbf9951dd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_swamp" ] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json index 99204a94e..27133bb4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 683, "name": "Aromatisse", "primaryType": "fairy", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json index ca6279e1c..ddb33e1d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 719, "name": "Diancie", "primaryType": "rock", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json index ee0f94a5f..497659d3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 695, "name": "Heliolisk", "primaryType": "electric", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json index ebec08b50..294a71abd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 694, "name": "Helioptile", "primaryType": "electric", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json index 648b56108..7c29e45af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 720, "name": "Hoopa", "primaryType": "psychic", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json index 179dc9778..d018a7276 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 667, "name": "Litleo", "primaryType": "fire", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json index 4bc51c2d1..264642691 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 674, "name": "Pancham", "primaryType": "fighting", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json index 1039d22a2..741758fbe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 675, "name": "Pangoro", "primaryType": "fighting", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json index c36120a4c..029607fa0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 668, "name": "Pyroar", "primaryType": "fire", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json index b0ab72be4..13a85aa24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 685, "name": "Slurpuff", "primaryType": "fairy", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json index 2d8e3fed7..06f3647ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 682, "name": "Spritzee", "primaryType": "fairy", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json index f5605208a..baaaba691 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 684, "name": "Swirlix", "primaryType": "fairy", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json index f1b1345e0..8bc49a9ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 721, "name": "Volcanion", "primaryType": "fire", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json index 8e223da2c..83d88c81c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 717, "name": "Yveltal", "primaryType": "dark", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json new file mode 100644 index 000000000..5135d6d78 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json @@ -0,0 +1,130 @@ +{ + "implemented": true, + "nationalPokedexNumber": 1025, + "name": "Pecharunt", + "primaryType": "poison", + "secondaryType": "ghost", + "maleRatio": -1, + "height": 3, + "weight": 3, + "pokedex": [ + "cobblemon.species.pecharunt.desc" + ], + "labels": [ + "gen9", + "mythical" + ], + "aspects": [], + "abilities": [ + "poisonpuppeteer", + "h:poisonpuppeteer" + ], + "eggGroups": [ + "undiscovered" + ], + "baseStats": { + "hp": 88, + "attack": 88, + "defence": 160, + "special_attack": 88, + "special_defence": 88, + "speed": 88 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 300, + "experienceGroup": "slow", + "catchRate": 3, + "eggCycles": 20, + "baseFriendship": 0, + "moves": [ + "1:smog", + "1:poisongas", + "1:memento", + "1:astonish", + "1:defensecurl", + "1:rollout", + "1:meanlook", + "8:withdraw", + "16:destinybond", + "24:faketears", + "32:partingshot", + "40:shadowball", + "48:malignantchain", + "56:toxic", + "64:nastyplot", + "72:recover", + "tm:acidspray", + "tm:curse", + "tm:endure", + "tm:faketears", + "tm:foulplay", + "tm:gunkshot", + "tm:hex", + "tm:imprison", + "tm:nastyplot", + "tm:nightshade", + "tm:phantomforce", + "tm:poltergeist", + "tm:protect", + "tm:rest", + "tm:rollout", + "tm:shadowball", + "tm:sleeptalk", + "tm:sludgebomb", + "tm:sludgewave", + "tm:spite", + "tm:substitute", + "tm:terablast", + "tm:toxic", + "tm:venoshock", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:poltergeist", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite" + ], + "evolutions": [], + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "pecharunt", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json new file mode 100644 index 000000000..3f8e943ce --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json @@ -0,0 +1,273 @@ +{ + "implemented": true, + "nationalPokedexNumber": 1024, + "name": "Terapagos", + "primaryType": "normal", + "maleRatio": 0.5, + "height": 2, + "weight": 65, + "pokedex": [ + "cobblemon.species.terapagos.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [ + "normal-form" + ], + "abilities": [ + "terashift", + "h:terashift" + ], + "eggGroups": [ + "undiscovered" + ], + "baseStats": { + "hp": 90, + "attack": 65, + "defence": 85, + "special_attack": 65, + "special_defence": 85, + "speed": 60 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 90, + "experienceGroup": "slow", + "catchRate": 255, + "eggCycles": 5, + "baseFriendship": 50, + "moves": [ + "1:withdraw", + "1:triattack", + "1:rapidspin", + "10:ancientpower", + "20:headbutt", + "30:protect", + "40:earthpower", + "50:heavyslam", + "60:terastarstorm", + "70:doubleedge", + "80:rockpolish", + "90:gyroball", + "tm:ancientpower", + "tm:aurasphere", + "tm:bodypress", + "tm:bodyslam", + "tm:bugbuzz", + "tm:calmmind", + "tm:crunch", + "tm:darkpulse", + "tm:dazzlinggleam", + "tm:doubleedge", + "tm:dragonpulse", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:flamethrower", + "tm:flareblitz", + "tm:flashcannon", + "tm:gigaimpact", + "tm:gravity", + "tm:gyroball", + "tm:headbutt", + "tm:heatcrash", + "tm:heavyslam", + "tm:hyperbeam", + "tm:icebeam", + "tm:icespinner", + "tm:ironhead", + "tm:meteorbeam", + "tm:powergem", + "tm:protect", + "tm:raindance", + "tm:rest", + "tm:roar", + "tm:rockpolish", + "tm:rockslide", + "tm:scorchingsands", + "tm:sleeptalk", + "tm:solarbeam", + "tm:stealthrock", + "tm:stoneedge", + "tm:storedpower", + "tm:substitute", + "tm:sunnyday", + "tm:supercellslam", + "tm:surf", + "tm:takedown", + "tm:thunder", + "tm:thunderbolt", + "tm:toxic", + "tm:triattack", + "tm:waterpulse", + "tm:weatherball", + "tm:wildcharge", + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" + ], + "evolutions": [], + "forms": [ + { + "name": "Terastal", + "primaryType": "normal", + "maleRatio": 0.5, + "height": 3, + "weight": 160, + "pokedex": [ + "cobblemon.species.terapagos-terastal.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [ + "terastal-form" + ], + "abilities": [ + "terashell", + "h:terashell" + ], + "baseStats": { + "hp": 95, + "attack": 95, + "defence": 110, + "special_attack": 105, + "special_defence": 110, + "speed": 85 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, + "baseExperienceYield": 120, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, + "lightingData": { + "lightLevel": 10, + "liquidGlowMode": "BOTH" + } + }, + { + "name": "Stellar", + "primaryType": "normal", + "maleRatio": 0.5, + "height": 17, + "weight": 770, + "pokedex": [ + "cobblemon.species.terapagos-stellar.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [ + "stellar-form" + ], + "abilities": [ + "teraformzero", + "h:teraformzero" + ], + "baseStats": { + "hp": 160, + "attack": 105, + "defence": 110, + "special_attack": 130, + "special_defence": 110, + "speed": 85 + }, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 140, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "BOTH" + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt index 4cbe9b64f..d2424a0bd 100644 --- a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt +++ b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt @@ -179,15 +179,15 @@ class ItemRecipeDatagen(arg: PackOutput, registries: CompletableFuture