T H E O R B

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>

CHANGELOG.md

@@ -1,107 +1,32 @@
 # Changelog
-## [1.8.3 (MONTH xth, 2026)](#1-8-3)
+## [1.8.x (MONTH xth, 2026)](#1-8-x)
 
 ### Additions
 
-### New Rideable Pokémon
-- Vikavolt
-- Fearow
+### New rideable Pokémon
 
-### Particles
-## New Move Animations
-- Water Shuriken
-
-### Cries added/updated for the following Pokémon
-- Hoppip
-- Skiploom
-- Jumpluff
-- Houndour
-- Houndoom
-- Wurmple
-- Silcoon
-- Beautifly
-- Cascoon
-- Dustox
-- Surskit
-- Masquerain
-- Torkoal
-- Starly
-- Staravia
-- Staraptor
-- Combee
-- Vespiquen
-- Dusknoir
-- Helioptile
-- Heliolisk
-- Grubbin
-- Charjabug
-- Vikavolt
-- Applin (updated)
-- Flapple (updated)
-- Appletun
-- Runerigus
-- Dipplin
+### Pokémon Added
 
 ### Model updates for the following Pokémon
 
 ### Animation updates for the following Pokémon
-- Vikavolt
-- Magby
-- Magmar
-- Ninetales (+ Alolan)
-- Spearow
-- Fearow
-- Squawkabilly
-- Mudkip
-- Marshtomp
-- Swampert
 
 ### Changes
-- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy
-- Moved EXP Candies from the Medicine recipe book category to the Misc category
-- Removed Dynamic Lights data from the Magmarizer item for consistency with the block
-- Added `doPokemonPredation` gamerule, which controls aggressiveness of Pokémon with `hate_entity` brain task defined
-- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found by `hate_entity` brain task 
-- Prehistoric Eroded Pillar generates slightly more frequently
-- Togekiss was changed from jet style mount to bird
+- Reworked spawn presets and added structure tags for spawns
 
 ### Fixes
-- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
-- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
-- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
-- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
-- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
-- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
-- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
-- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion
-- Fixed friendship booster items not being recognised as such
-- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot)
-- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event
-- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands
-- Fixed MoLang that's targeting players intermittedly failing when they have died, needing them to relog
-- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots
-- Fixed party overlay not hiding when the player opens the Pokédex scanner 
-- Added compat for AppleSkin
-- Fixed some display names having unintended font colours
-- Fixed `hate_entity` task focusing on its own entity
-  - Thus enabled deadly warfare between Zangoose and Seviper
-- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now generate
-- Fixed Frogadier floating in its battle_idle animation
-- Fixed absence or incorrect mergers in spawning conditions, making max height/depth of conditions to use the min value instead
-- Added stricter riding checks on server side to prevent possible packet forgery when player tries to ride pokemon
-- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures
-- Fixed Archeops T-posing during its air_cry animation
+- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
+- Fixed Minior's "Shields Down" ability not working as intended
+- Fixed size error with ceiling attached Orb hitbox
 
 ### Developer
-- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation
-- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end)
-- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead
-  - it is now tied much closer to the actual entity rather than the player (or their connection)
 
 ### Molang & Datapacks
-- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`)
-- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as target
-- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target 
+- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
+
+### Particles
+
+#### New Move Animations
 
 ### Localization
-- Updated translations for:
+- Updated translations for:

changelogs/CHANGELOG-1.8.3.md

@@ -0,0 +1,107 @@
+# Changelog
+## [1.8.3 (October 25th, 2026)](#1-8-3)
+
+### Additions
+- Added compatability with AppleSkin.
+
+### New Rideable Pokémon
+- Vikavolt
+- Fearow
+
+### Particles
+## New Move Animations
+- Water Shuriken
+
+### Cries added/updated for the following Pokémon
+- Hoppip
+- Skiploom
+- Jumpluff
+- Houndour
+- Houndoom
+- Wurmple
+- Silcoon
+- Beautifly
+- Cascoon
+- Dustox
+- Surskit
+- Masquerain
+- Torkoal
+- Starly
+- Staravia
+- Staraptor
+- Combee
+- Vespiquen
+- Dusknoir
+- Helioptile
+- Heliolisk
+- Grubbin
+- Charjabug
+- Vikavolt
+- Applin (updated)
+- Flapple (updated)
+- Appletun
+- Runerigus
+- Dipplin
+
+### Animation updates for the following Pokémon
+- Vikavolt
+- Magby
+- Magmar
+- Ninetales (+ Alolan)
+- Spearow
+- Fearow
+- Squawkabilly
+- Mudkip
+- Marshtomp
+- Swampert
+
+### Changes
+- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy.
+- Moved EXP Candies from the Medicine recipe book category to the Misc category.
+- Removed Dynamic Lights data from the Magmarizer item for consistency with the block.
+- Added `doPokemonPredation` game rule, which controls aggressiveness of Pokémon with the `hate_entity` brain task defined.
+- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found in `hate_entity` brain tasks.
+- Prehistoric Eroded Pillar generates slightly more frequently.
+- Togekiss was changed from a jet-style mount to bird-style.
+
+### Fixes
+- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
+- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
+- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
+- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
+- Fixed some display names in the Pokédex evolution tree having unintended font colours.
+- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
+- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
+- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
+- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion.
+- Fixed friendship booster items not being recognised as such.
+- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot).
+- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event.
+- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands.
+- Fixed MoLang that's targeting players intermittedly failing when they have died, requiring them to relog.
+- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots.
+- Fixed party overlay not hiding when the player opens the Pokédex scanner.
+- Fixed `hate_entity` task focusing on its own entity, therefore enabling deadly warfare between Zangoose and Seviper.
+- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now actually generate (oops).
+- Fixed Frogadier floating in its `battle_idle` animation.
+- Fixed absence or incorrect mergers in spawning conditions, causing the max height/depth of conditions to use the min value instead.
+- Added stricter riding checks on server side to prevent possible packet forgery when a player tries to ride Pokémon.
+- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures.
+- Fixed Archeops T-posing during its `air_cry` animation.
+
+### Developer
+- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation.
+- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end).
+- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead.
+  - It is now tied much closer to the actual entity rather than the player or their connection.
+
+### Molang & Datapacks
+- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`).
+- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as the target parameter.
+- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target.
+
+### Localization
+- Updated translations for:
+  - Russian
+  - Japanese
+  - Brazilian Portuguese

common/src/main/java/com/cobblemon/mod/common/mixin/client/ClientRecipeBookMixin.java

@@ -69,7 +69,7 @@ public abstract class ClientRecipeBookMixin {
                     value = "INVOKE",
                     target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;"
             ))
-    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(name = "map2") Map<RecipeBookCategories, List<RecipeCollection>> map2) {
+    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(ordinal = 1) Map<RecipeBookCategories, List<RecipeCollection>> map2) {
         CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List) list.stream().flatMap((recipeBookCategoriesx) -> ((List) map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
     }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/RecipeBookComponentMixin.java

@@ -20,14 +20,14 @@ import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(RecipeBookComponent.class)
 public class RecipeBookComponentMixin {
-    @Definition(id = "recipeBookCategories", local = @Local(name = "recipeBookCategories"))
+    @Definition(id = "recipeBookCategories", local = @Local(type = RecipeBookCategories.class))
     @Definition(id = "FURNACE_SEARCH", field = "Lnet/minecraft/client/RecipeBookCategories;FURNACE_SEARCH:Lnet/minecraft/client/RecipeBookCategories;")
     @Expression("recipeBookCategories != FURNACE_SEARCH")
     @ModifyExpressionValue(
             method = "updateTabs",
             at = @At(value = "MIXINEXTRAS:EXPRESSION")
     )
-    private boolean notCookingPotSearch(boolean original, @Local(name = "recipeBookCategories") RecipeBookCategories recipeBookCategories) {
+    private boolean notCookingPotSearch(boolean original, @Local RecipeBookCategories recipeBookCategories) {
         return original && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory();
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -239,6 +239,10 @@ open class PokemonBattle(
     }
 
     fun writeShowdownAction(vararg messages: String) {
+        if (messages.any { it.contains("\n") || it.contains("\r") }) {
+            LOGGER.warn("Refusing to forward Showdown action with an embedded line break for battle {}: {}", battleId, messages.joinToString(" | "))
+            return
+        }
         log(messages.joinToString("\n"))
         ShowdownService.service.send(battleId, messages.toList().toTypedArray())
     }

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownActionRequest.kt

@@ -117,6 +117,9 @@ abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
 
 data class MoveActionResponse(var moveName: String, var targetPnx: String? = null, var gimmickID: String? = null): ShowdownActionResponse(ShowdownActionResponseType.MOVE) {
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
+        // Ensure that the gimmick ID the player is sending is valid
+        gimmickID?.let { if (it !in VALID_GIMMICK_IDS) return false }
+
         if (forceSwitch || showdownMoveSet == null) {
             return false
         }
@@ -168,6 +171,10 @@ data class MoveActionResponse(var moveName: String, var targetPnx: String? = nul
         gimmickID = buffer.readNullable { buffer.readString() }
         return this
     }
+
+    companion object {
+        private val VALID_GIMMICK_IDS = ShowdownMoveset.Gimmick.entries.map { it.id }.toSet()
+    }
 }
 
 data class HealItemActionResponse(var item: String) : ShowdownActionResponse(ShowdownActionResponseType.FORCE_PASS) {
@@ -183,7 +190,8 @@ data class HealItemActionResponse(var item: String) : ShowdownActionResponse(Sho
     }
 
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
-        return !forceSwitch
+        // Previously checked for !forceSwitch, excepts in the case of a forceSwitch, this couldn't legally be sent anyway.
+        return false
     }
 
     override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?): String {

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt

@@ -37,7 +37,6 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.cobblemonResource
 import java.util.concurrent.CompletableFuture
-import net.minecraft.world.entity.LivingEntity
 
 /**
  * Format: |move|POKEMON|MOVE|TARGET
@@ -77,7 +76,7 @@ class MoveInstruction(
             val pokemonName = userPokemon.getName()
             ShowdownInterpreter.lastCauser[battle.battleId] = message
             // For Spread targets the message data only gives the pnx strings. So we can't know what pokemon are actually targeted until the previous messages have been interpreted
-            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull() { poke -> poke.getPNX() == it }?.battlePokemon }
+            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull { poke -> poke.getPNX() == it }?.battlePokemon }
 
             val targetPokemonEntity = targetPokemon?.entity
             if (targetPokemonEntity != null) {
@@ -137,10 +136,20 @@ class MoveInstruction(
 
             val subsequentInstructions = instructionSet.findInstructionsCausedBy(this)
             val missedTargets = subsequentInstructions.filterIsInstance<MissInstruction>().mapNotNull { it.target }
+            val faintedTargets = subsequentInstructions.filterIsInstance<FaintInstruction>().map { it.faintingPokemon }
             val failed = subsequentInstructions.any { it is FailInstruction }
             val failedTargets = subsequentInstructions.filterIsInstance<FailInstruction>().mapNotNull { it.target }
             val hitCountInstruction = subsequentInstructions.filterIsInstance<HitCountInstruction>().firstOrNull()
 
+            runtime.environment.query.addFunction("target_fainted") { params ->
+                if (params.params.size == 0) {
+                    return@addFunction DoubleValue(faintedTargets.isNotEmpty())
+                } else {
+                    val entityUUID = params.getString(0)
+                    return@addFunction DoubleValue(faintedTargets.any { it.entity?.stringUUID == entityUUID })
+                }
+            }
+
             runtime.environment.query.addFunction("missed") { params ->
                 if (params.params.size == 0) {
                     return@addFunction DoubleValue(missedTargets.isNotEmpty())

common/src/main/kotlin/com/cobblemon/mod/common/block/OrbBlock.kt

@@ -30,7 +30,7 @@ class OrbBlock(properties: Properties) : SixFaceRotationalBlock(properties) {
 
         val FLOOR_NORTH = Shapes.box(0.3125, 0.0, 0.3125, 0.6875, 0.375, 0.6875)
         val WALL_NORTH = Shapes.box(0.3125, 0.3125, 0.625, 0.6875, 0.6875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.375, 0.6875, 1.0, 0.6875)
+        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.3125, 0.6875, 1.0, 0.6875)
     }
 
     init {

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/battle/BattleSelectActionsHandler.kt

@@ -8,9 +8,12 @@
 
 package com.cobblemon.mod.common.net.serverhandling.battle
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.battles.HealItemActionResponse
+import com.cobblemon.mod.common.battles.MoveActionResponse
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
@@ -25,6 +28,27 @@ object BattleSelectActionsHandler : ServerNetworkPacketHandler<BattleSelectActio
         if (!actor.mustChoose) {
             return
         }
+
+        // Battle command injection attempt detection
+        packet.showdownActionResponses.asSequence()
+            .flatMap {
+                when (it) {
+                    is MoveActionResponse -> sequenceOf(it.moveName, it.targetPnx, it.gimmickID)
+                    is HealItemActionResponse -> sequenceOf(it.item)
+                    else -> emptySequence()
+                }
+            }
+            .filterNotNull()
+            .firstOrNull { field -> field.any(Char::isISOControl) }
+            ?.let {
+                // Escapes control chars as \uXXXX to prevent forging logs.
+                val printable = it.replace(Regex("\\p{Cc}")) { "\\u%04x".format(it.value[0].code) }
+                Cobblemon.LOGGER.warn("Blocked battle command injection from ${player.name.string}: $printable")
+                actor.sendUpdate(BattleQueueRequestPacket(actor.request!!))
+                actor.sendUpdate(BattleMakeChoicePacket())
+                return
+            }
+
         try {
             actor.setActionResponses(packet.showdownActionResponses)
         } catch (e: IllegalActionChoiceException) {

common/src/main/resources/assets/cobblemon/lang/ja_jp.json

@@ -855,7 +855,7 @@
     "advancements.cobblemon.obtain_berry.description": "地表に育ち多くの用途を持つ、きのみを手に入れる",
     "advancements.cobblemon.obtain_mutated_berry": "想定外の結果",
     "advancements.cobblemon.obtain_mutated_berry.description": "違う種類のきのみの木を隣り合わせに植えて突然変異を目撃する",
-    "advancements.cobblemon.obtain_all_berries": "もぎもぎフルーツ",
+    "advancements.cobblemon.obtain_all_berries": "もぎってナッツ",
     "advancements.cobblemon.obtain_all_berries.description": "Cobblemonに登場する全てのきのみを集める",
     "advancements.cobblemon.use_pasture": "みんなのポケモン牧場",
     "advancements.cobblemon.use_pasture.description": "ぼくじょうブロックを作りポケモンを放し飼いにする",
@@ -6219,7 +6219,7 @@
     "cobblemon.egg_group.water_2": "水中②",
     "cobblemon.egg_group.ditto": "メタモン",
     "cobblemon.egg_group.dragon": "ドラゴン",
-    "cobblemon.egg_group.undiscovered": "タマゴ未発見",
+    "cobblemon.egg_group.undiscovered": "未発見",
     "cobblemon.trade.canceled.sender": "%1$s との交換リクエストをキャンセルしました。",
     "cobblemon.trade.canceled.receiver": "%1$s が交換リクエストをキャンセルしました...",
     "cobblemon.trade.sent": "%1$s との交換をリクエストしました。",
@@ -6981,7 +6981,7 @@
     "cobblemon.mark.ribbon_contest_sinnoh_tough_3.desc": "スーパーコンテスト たくましさ部門 ウルトラランク 優勝！",
     "cobblemon.mark.ribbon_contest_sinnoh_tough_4": "パワフルリボンマスター",
     "cobblemon.mark.ribbon_contest_super_master_beauty": "うつくしさマスターリボン",
-    "cobblemon.mark.ribbon_contest_super_master_beauty.title": "とうじきれいだった %1$s",
+    "cobblemon.mark.ribbon_contest_super_master_beauty.title": "とうじからきれいな %1$s",
     "cobblemon.mark.ribbon_contest_super_master_beauty.desc": "コンテストで うつくしさを 発揮した ポケモンに 贈られる 記念リボン",
     "cobblemon.mark.ribbon_contest_super_master_cleverness": "かしこさマスターリボン",
     "cobblemon.mark.ribbon_contest_super_master_cleverness.title": "てんさいとよばれた %1$s",
@@ -7002,7 +7002,7 @@
     "cobblemon.mark.ribbon_contest_super_master_coolness": "かっこよさマスターリボン",
     "cobblemon.mark.ribbon_contest_super_master_cuteness.desc": "コンテストで かわいさを 発揮した ポケモンに 贈られる 記念リボン",
     "cobblemon.mark.ribbon_contest_super_master_toughness": "たくましさマスターリボン",
-    "cobblemon.mark.ribbon_contest_super_master_toughness.title": "ムキムキの %1$s",
+    "cobblemon.mark.ribbon_contest_super_master_toughness.title": "むかしからムキムキの %1$s",
     "cobblemon.mark.ribbon_contest_super_master_toughness.desc": "コンテストで たくましさを 発揮した ポケモンに 贈られる 記念リボン",
     "cobblemon.mark.ribbon_contest_super_star": "コンテストスターリボン",
     "cobblemon.mark.ribbon_contest_super_star.title": "でんせつてきスターの %1$s",
@@ -9243,7 +9243,7 @@
     "cobblemon.ui.moves.learnset.tm.discovered": "発見済み",
     "cobblemon.ui.moves.level": "レベルアップ",
     "cobblemon.ui.moves.egg": "タマゴ技",
-    "cobblemon.ui.moves.tm": "わざマシン",
+    "cobblemon.ui.moves.tm": "わざﾏｼﾝ",
     "cobblemon.ui.tm_machine.can_learn": "覚えられる",
     "cobblemon.ui.tm_machine.cannot_learn": "覚えられない",
     "cobblemon.ui.tm_machine.learned": "覚えている",
@@ -9596,5 +9596,42 @@
     "cobblemon.config.ui.world_spawning_blocklist": "ワールドごとのスポーンブロックリスト",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "ポケモンの出現ロジックを無効にするワールド。",
     "advancements.cobblemon.obtain_tm": "Show Me Your Moves!",
-    "advancements.cobblemon.obtain_tm.description": "わざマシンを見つけるか、印刷する"
+    "advancements.cobblemon.obtain_tm.description": "わざマシンを見つけるか、印刷する",
+    "itemGroup.cobblemon.tm_item": "Cobblemon：わざマシン",
+    "block.cobblemon.wistensu": "フジブヨウ",
+    "block.cobblemon.lobaila": "ミゾグレン",
+    "block.cobblemon.pauvillea": "フラビリア",
+    "block.cobblemon.pomohana": "ポンノハナ",
+    "block.cobblemon.voltaconia": "ボルトコニア",
+    "block.cobblemon.verdroot": "ミノルート",
+    "block.cobblemon.lucibell": "サイヴェル",
+    "block.cobblemon.mistleaf": "ミストリーフ",
+    "cobblemon.ui.pokedex.info.evolution_tree": "進化の流れ",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "%1$sが必要",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "%1$sとのポケモン交換で進化",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "ポケモン交換で進化",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "予備のモンスターボールと手持ちの空きが必要",
+    "cobblemon.ui.pokedex.evolution.or": "または",
+    "cobblemon.ui.pokedex.evolution.one_of": "以下のいずれか：",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "プレイヤーが進捗 %1$sを達成している必要あり",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "バトルで%1$s回急所に当てる",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "%1$sバイオームでは進化出来ない",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "%2$sを除いた%1$sバイオームでのみ進化",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "%1$sバイオームでのみ進化",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "%1$sブロック分旅をする",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "バトルで倒れず%1$sダメージ受ける",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "進化するためにはバトルで%1$sを倒す",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "なかよし度%1$sが必要",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "%1$sを覚える必要がある",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "%1$sタイプの技を覚えておく必要がある",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "%1$sを持っている必要がある",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "レベル%1$sから進化",
+    "cobblemon.ui.pokedex.requirement.party_member.tooltip": "レベルが%1$sから%2$sの間で進化",
+    "cobblemon.ui.pokedex.requirement.pokemon_properties.tooltip": "%1$sでなければいけない",
+    "cobblemon.ui.pokedex.requirement.properties.and": "%1$s と %2$s",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.between": "レベルが%1$sから%2$sの間で進化",
+    "cobblemon.ui.pokedex.requirement.moon_phase.tooltip": "月の満ち欠けが%1$sでなければいけない",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_amped": "性格が§aがんばりや§r、 §aゆうかん§r、 §aいじっぱり§r、 §aやんちゃ§r、 §aすなお§r、 §aわんぱく§r、 §aのうてんき§r、 §aせっかち§r、 §aようき§r、 §aむじゃき§r、 §aうっかりや§r、 §aなまいき§r、 §aきまぐれ§rのどれか",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_low_key": "性格が§aさみしがり§r、 §aずぶとい§r、 §aのんき§r、 §aおくびょう§r、 §aまじめ§r、 §aひかえめ§r、 §aおっとり§r、 §aれいせい§r、 §aてれや§r、 §aおだやか§r、 §a\tおとなしい§r、 §aしんちょう§rのどれか",
+    "cobblemon.ui.pokedex.requirement.nickname.malamar": "ニックネームを§aDinnerbone§rか§aGrumm§rにする"
 }

common/src/main/resources/assets/cobblemon/lang/pt_br.json

@@ -9413,5 +9413,114 @@
     "cobblemon.ui.pokedex.info.form.tatsugiri-stretchymega": "Mega Tatsugiri Forma Estendida",
     "cobblemon.species.tatsugiri-stretchymega.desc": "Usando a energia da Mega Evolução, cria um prato onde repousar, permitindo com que se mova com mobilidade total até mesmo pelo ar.",
     "cobblemon.ui.pokedex.info.form.baxcalibur-mega": "Mega Baxcalibur",
-    "cobblemon.species.baxcalibur-mega.desc": "A lâmina dorsal de Baxcalibur ficou ainda maior graças à Mega Evolução. Esse Pokémon dispara feixes do cabo localizado em seu peito."
+    "cobblemon.species.baxcalibur-mega.desc": "A lâmina dorsal de Baxcalibur ficou ainda maior graças à Mega Evolução. Esse Pokémon dispara feixes do cabo localizado em seu peito.",
+    "itemGroup.cobblemon.tm_item": "Cobblemon: Máquinas Técnicas",
+    "block.cobblemon.pomohana": "Pomohana",
+    "block.cobblemon.pauvillea": "Pa'uvillea",
+    "block.cobblemon.lobaila": "Lobaila",
+    "block.cobblemon.wistensu": "Wistensu",
+    "block.cobblemon.voltaconia": "Voltaconia",
+    "block.cobblemon.verdroot": "Verdroot",
+    "block.cobblemon.lucibell": "Lucibell",
+    "block.cobblemon.mistleaf": "Mistleaf",
+    "cobblemon.ui.pokedex.info.evolution_tree": "Árvore Evolutiva",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "Precisa do item %1$s para evoluir",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "Evolui quando trocado segurando %1$s",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "Evolui quando trocado",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "Também requer uma Pokébola extra e um espaço vazio na equipe",
+    "cobblemon.ui.pokedex.evolution.or": "OU",
+    "cobblemon.ui.pokedex.evolution.one_of": "Um de:",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "Jogador precisa ter a conquista %1$s",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "Precisa acertar %1$s acertos críticos em batalha",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "Não pode estar no bioma %1$s",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "Precisa estar no bioma %1$s e não no bioma %2$s",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "Precisa estar no bioma %1$s",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "Precisa viajar %1$s blocos",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "Precisa receber %1$s de dano em uma batalha sem desmaiar",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "Precisa derrotar %1$s em batalha para evoluir",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "Requer no mínimo %1$s de amizade",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "Precisa conhecer o movimento %1$s",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "Precisa conhecer um movimento do tipo %1$s",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "Precisa estar segurando %1$s",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "Evolui ao ultrapassar o nível %1$s",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.between": "Evoluiu entre os níveis %1$s e %2$s",
+    "cobblemon.ui.pokedex.requirement.moon_phase.tooltip": "Precisa evoluir na fase %1$s da lua",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_amped": "Precisa ter a natureza §aDestemida§r, §aValente§r, §aRígida§r, §aTeimosa§r, §aDócil§r, §aInquieta§r, §aRelaxada§r, §aApressada§r, §aAlegre§r, §aInguênua§r, §aImprudente§r, §aAtrevida§r, ou §aPeculiar§r",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_low_key": "Precisa ter a natureza §aSolitária§r, §aCorajosa§r, §aDescontraída§r, §aTímida§r, §aSéria§r, §aModesta§r, §aMansa§r, §aQuieta§r, §aAtrapalhada§r, §aCalma§r, §aGentil§r, ou §aCuidadosa§r",
+    "cobblemon.ui.pokedex.requirement.negate.tooltip": "Não: %1$s",
+    "cobblemon.ui.pokedex.requirement.nickname.malamar": "Precisa se chamar §aDinnerbone§r ou §aGrumm§r",
+    "cobblemon.ui.pokedex.requirement.party_member.anticondition.tooltip": "Equipe não pode ter um Pokémon com %1$s",
+    "cobblemon.ui.pokedex.requirement.party_member.tooltip": "Equipe precisa ter um Pokémon com %1$s",
+    "cobblemon.ui.pokedex.requirement.pokemon_properties.tooltip": "Precisa estar %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.and": "%1$s e %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.custom.cocoon_species": "Casulo %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.held_item": "Segurando %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.int_feature": "%1$s %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.nature": "Natureza %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.nickname": "Nomeado %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.type": "Tipo %1$s",
+    "cobblemon.ui.pokedex.requirement.property_range.tooltip": "Requer %1$s entre %2$s e %3$s",
+    "cobblemon.ui.pokedex.requirement.recoil.tooltip": "Precisa sofrer %1$s unidades de recuo em batalha",
+    "cobblemon.ui.pokedex.requirement.stat_compare.tooltip": "Precisa ter seu %1$s acima de %2$s",
+    "cobblemon.ui.pokedex.requirement.stat_equal.tooltip": "Precisa ter seu %1$s igual ao seu %2$s",
+    "cobblemon.ui.pokedex.requirement.structure.anticondition.tooltip": "Não pode estar na estrutura %1$s",
+    "cobblemon.ui.pokedex.requirement.structure.both.tooltip": "Precisa estar na estrutura %1$s e não na estrutura %2$s",
+    "cobblemon.ui.pokedex.requirement.structure.tooltip": "Precisa estar na estrutura %1$s",
+    "cobblemon.ui.pokedex.requirement.time_range.tooltip": "Precisa evoluir durante %1$s",
+    "cobblemon.ui.pokedex.requirement.use_move.tooltip": "Precisa usar o movimento %1$s em batalha",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.raining": "Precisa estar na chuva para evoluir",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.thundering": "Precisa estar em uma tempestade para evoluir",
+    "cobblemon.ui.moon_phase.full_moon": "Lua Cheia",
+    "cobblemon.ui.moon_phase.waning_gibbous": "Crescente Gibosa",
+    "cobblemon.ui.moon_phase.third_quarter": "Quarto Crescente",
+    "cobblemon.ui.moon_phase.waning_crescent": "Crescente",
+    "cobblemon.ui.moon_phase.new_moon": "Lua Nova",
+    "cobblemon.ui.moon_phase.waxing_crescent": "Minguante",
+    "cobblemon.ui.moon_phase.first_quarter": "Quarto Minguante",
+    "cobblemon.ui.moon_phase.waxing_gibbous": "Minguante Gibosa",
+    "cobblemon.ui.time_range.any": "Qualquer",
+    "cobblemon.ui.time_range.day": "Dia",
+    "cobblemon.ui.time_range.night": "Noite",
+    "cobblemon.ui.time_range.noon": "Meio-dia",
+    "cobblemon.ui.time_range.midnight": "Meia-noite",
+    "cobblemon.ui.time_range.dawn": "Alvorecer",
+    "cobblemon.ui.time_range.dusk": "Entardecer",
+    "cobblemon.ui.time_range.twilight": "Crepúsculo",
+    "cobblemon.ui.time_range.morning": "Manhã",
+    "cobblemon.ui.time_range.afternoon": "Tarde",
+    "cobblemon.ui.time_range.predawn": "Pré-amanhecer",
+    "cobblemon.ui.time_range.evening": "Tardinha",
+    "cobblemon.subtitle.item.bright_powder.use": "Pó Brilhante ilumina",
+    "cobblemon.config.ui.type_gem_max_connected": "Máximo de Blocos de Gema de Tipo Conectados",
+    "cobblemon.config.ui.type_gem_min_growth": "Mínimo de Crescimento de Gema de Tipo",
+    "cobblemon.config.ui.type_gem_growth_chance": "Chance de Crescimento de Gema de Tipo",
+    "cobblemon.config.ui.type_gem_initial_expansion_cycles": "Cíclos de Expansão Iniciais de Gemas de Tipo",
+    "cobblemon.battle.activate.ficklebeam": "%1$s vai com tudo neste próximo ataque!",
+    "tag.item.cobblemon.oricorio_flowers": "Flores de Néctar",
+    "tag.item.cobblemon.terrain_plants": "Plantas de Terreno",
+    "tag.item.cobblemon.tall_flowers": "Flores Altas",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_kalosbiome": "Kalosiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_alolabiome": "Alolano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_kantobiome": "Kantoniano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_alolabiome": "Alolano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_unovabiome": "Unovano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_alolabiome": "Alolano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_kantobiome": "Kantoniano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_kalosbiome": "Kalosiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_galarbiome": "Galariano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_kantobiome": "Kantoniano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_galarbiome": "Galariano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_sinnohbiome": "Sinnohano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_unovabiome": "Unovano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_alolabiome": "Alolano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_kantobiome": "Kantoniano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_johtobiome": "Johtoniano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_hisuibiome": "Hisuiano",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_unovabiome": "Unovano"
 }

common/src/main/resources/assets/cobblemon/lang/ru_ru.json

@@ -9021,5 +9021,34 @@
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "Миры, в которых отключается принцип появления покемонов.",
     "advancements.cobblemon.obtain_tm.description": "Найдите или напечатайте ТМ",
     "cobblemon.species.victreebel-mega.desc": "В результате Мега эволюции объём кислоты у этого покемона увеличился, заполняя весь его рот. Если он не будет осторожен, кислота переполнится и выльется наружу.",
-    "cobblemon.ui.pokedex.info.form.victreebel-mega": "Мега Виктрибелл"
+    "cobblemon.ui.pokedex.info.form.victreebel-mega": "Мега Виктрибелл",
+    "itemGroup.cobblemon.tm_item": "Технические машины",
+    "block.cobblemon.pomohana": "Помохана",
+    "block.cobblemon.pauvillea": "Па'увилия",
+    "block.cobblemon.lobaila": "Лобалия",
+    "block.cobblemon.wistensu": "Вистенсу",
+    "block.cobblemon.voltaconia": "Вольтакония",
+    "block.cobblemon.verdroot": "Вердрут",
+    "block.cobblemon.lucibell": "Люсибель",
+    "block.cobblemon.mistleaf": "Мистлиф",
+    "cobblemon.ui.pokedex.info.evolution_tree": "Древо эволюции",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "Требуется %1$s для эволюции",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "Эволюционирует при обмене с %1$s",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "Эволюционирует при обмене",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "Также требует запасной покебол и свободное место в команде",
+    "cobblemon.ui.pokedex.evolution.or": "ИЛИ",
+    "cobblemon.ui.pokedex.evolution.one_of": "Один из:",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "У игрока должно быть достижение %1$s",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "Должен попасть %1$s критическими ударами в битве",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "Не должен быть в %1$s биоме",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "Должен быть в %1$s биоме и не в %2$s биоме",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "Должен быть в %1$s биоме",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "Должен пройти %1$s блоков",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "Должен получить %1$s урона в битве без поражения",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "Должен победить против %1$s в битве для эволюции",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "Требует как минимум %1$s дружбы",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "Должен знать приём %1$s",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "Должен знать приём %1$s типа",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "Должен удерживать %1$s",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "Эволюционирует начиная с %1$s уровня"
 }

common/src/main/resources/data/cobblemon/showdown.json

@@ -1,3 +1,3 @@
 {
-    "showdownVersion":  18
+    "showdownVersion":  19
 }

common/src/main/resources/data/cobblemon/spawn_detail_presets/desert_pyramid.json

@@ -1,6 +1,6 @@
 {
   "condition": {
-	"minY": 62,
+	"minY": 48,
 	"neededBaseBlocks": [
       "minecraft:sandstone"
     ],

common/src/main/resources/data/cobblemon/spawn_detail_presets/end_city.json

@@ -1,15 +0,0 @@
-{
-  "condition": {
-	"structures": [
-	  "minecraft:end_city"
-    ],
-	"neededBaseBlocks": [
-      "minecraft:end_stone_bricks",
-	  "minecraft:purpur_block",
-	  "minecraft:purpur_pillar"
-    ],
-	"neededNearbyBlocks": [
-      "#cobblemon:end_city_blocks"
-	]
-  }
-}

common/src/main/resources/data/cobblemon/spawn_detail_presets/illager_structures.json

@@ -1,10 +0,0 @@
-{
-  "condition": {
-	"structures": [
-	  "minecraft:pillager_outpost",
-	  "minecraft:swamp_hut",
-	  "minecraft:mansion"
-    ],
-	"minY": 62
-  }
-}

common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json

@@ -1,6 +1,6 @@
 {
   "condition": {
-	"minY": 62,
+	"minY": 48,
 	"neededBaseBlocks": [
       "minecraft:cobblestone",
 	  "minecraft:mossy_cobblestone"

common/src/main/resources/data/cobblemon/spawn_detail_presets/nether_structures.json

@@ -1,19 +0,0 @@
-{
-  "condition": {
-	"structures": [
-	  "minecraft:bastion_remnant",
-	  "minecraft:fortress"
-    ],
-	"neededBaseBlocks": [
-      "minecraft:chiseled_polished_blackstone",
-	  "minecraft:cracked_polished_blackstone_bricks",
-	  "minecraft:gilded_blackstone",
-	  "minecraft:nether_bricks",
-	  "minecraft:polished_basalt",
-	  "minecraft:polished_blackstone_bricks"
-    ],
-	"neededNearbyBlocks": [
-      "#cobblemon:nether_structure_blocks"
-	]
-  }
-}

common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_monument.json

@@ -1,8 +0,0 @@
-{
-  "condition": {
-	"structures": [
-	  "minecraft:monument"
-    ],
-	"maxY": 62
-  }
-}

common/src/main/resources/data/cobblemon/spawn_detail_presets/ocean_ruins.json

@@ -1,11 +0,0 @@
-{
-  "condition": {
-	"structures": [
-	  "#minecraft:ocean_ruin"
-    ],
-	"maxY": 62,
-	"neededNearbyBlocks": [
-      "#cobblemon:ocean_ruin_blocks"
-	]
-  }
-}

common/src/main/resources/data/cobblemon/spawn_detail_presets/pillager_outpost.json

@@ -1,11 +0,0 @@
-{
-  "condition": {
-	"structures": [
-	  "minecraft:pillager_outpost"
-    ],
-	"minY": 62,
-	"neededNearbyBlocks": [
-      "#cobblemon:pillager_outpost_blocks"
-	]
-  }
-}

common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json

@@ -31,6 +31,9 @@
                 "isRaining": false
             },
             "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
                 "biomes": [
                     "#cobblemon:is_spooky",
                     "#cobblemon:is_freezing"
@@ -188,6 +191,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "isRaining": false
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -232,6 +240,37 @@
                     "isPokeSnack": true
                 }
             },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "zubat-8",
+            "pokemon": "zubat",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "1-25",
+            "weight": 27.0,
+            "weightMultiplier": {
+                "multiplier": 2.0,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "minSkyLight": 0,
                 "maxSkyLight": 7,

common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json

@@ -31,6 +31,9 @@
                 "isRaining": false
             },
             "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
                 "biomes": [
                     "#cobblemon:is_spooky",
                     "#cobblemon:is_freezing"
@@ -188,6 +191,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "isRaining": false
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -232,6 +240,37 @@
                     "isPokeSnack": true
                 }
             },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "golbat-8",
+            "pokemon": "golbat",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "22-46",
+            "weight": 2.7,
+            "weightMultiplier": {
+                "multiplier": 2.0,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "minSkyLight": 0,
                 "maxSkyLight": 7,

common/src/main/resources/data/cobblemon/spawn_pool_world/0052_meowth.json

@@ -78,7 +78,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -155,7 +155,7 @@
                     "#cobblemon:is_arid"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },
@@ -163,8 +163,7 @@
             "id": "meowth-alolan-5",
             "pokemon": "meowth alolan",
             "presets": [
-                "natural",
-                "illager_structures"
+                "natural"
             ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -191,7 +190,11 @@
                 "biomes": [
                     "#cobblemon:is_overworld"
                 ],
-                "isRaining": false
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_illager_structure"
+                ],
+                "minY": 62
             },
             "anticondition": {
                 "biomes": [
@@ -204,8 +207,7 @@
             "id": "meowth-alolan-6",
             "pokemon": "meowth alolan",
             "presets": [
-                "natural",
-                "illager_structures"
+                "natural"
             ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -232,15 +234,16 @@
                 "biomes": [
                     "#cobblemon:is_arid",
                     "#cobblemon:is_freezing"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_illager_structure"
+                ],
+                "minY": 62
             }
         },
         {
             "id": "meowth-alolan-7",
             "pokemon": "meowth alolan",
-            "presets": [
-                "illager_structures"
-            ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
             "bucket": "uncommon",
@@ -257,6 +260,9 @@
                 "biomes": [
                     "#cobblemon:is_overworld"
                 ],
+                "structures": [
+                    "#cobblemon:spawns/is_illager_structure"
+                ],
                 "minY": 62
             }
         },
@@ -312,7 +318,7 @@
                     "#cobblemon:is_taiga"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0053_persian.json

@@ -78,7 +78,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -155,7 +155,7 @@
                     "#cobblemon:is_arid"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },
@@ -163,8 +163,7 @@
             "id": "persian-alolan-5",
             "pokemon": "persian alolan",
             "presets": [
-                "natural",
-                "illager_structures"
+                "natural"
             ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -191,7 +190,11 @@
                 "biomes": [
                     "#cobblemon:is_overworld"
                 ],
-                "isRaining": false
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_illager_structure"
+                ],
+                "minY": 62
             },
             "anticondition": {
                 "biomes": [
@@ -204,8 +207,7 @@
             "id": "persian-alolan-6",
             "pokemon": "persian alolan",
             "presets": [
-                "natural",
-                "illager_structures"
+                "natural"
             ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -232,15 +234,16 @@
                 "biomes": [
                     "#cobblemon:is_arid",
                     "#cobblemon:is_freezing"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_illager_structure"
+                ],
+                "minY": 62
             }
         },
         {
             "id": "persian-alolan-7",
             "pokemon": "persian alolan",
-            "presets": [
-                "illager_structures"
-            ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
             "bucket": "uncommon",
@@ -257,6 +260,9 @@
                 "biomes": [
                     "#cobblemon:is_overworld"
                 ],
+                "structures": [
+                    "#cobblemon:spawns/is_illager_structure"
+                ],
                 "minY": 62
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0058_growlithe.json

@@ -46,7 +46,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0059_arcanine.json

@@ -58,7 +58,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json

@@ -107,7 +107,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -220,7 +220,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -339,7 +339,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -414,7 +414,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json

@@ -107,7 +107,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -220,7 +220,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -339,7 +339,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -414,7 +414,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json

@@ -27,7 +27,7 @@
                     "#aether:is_aether",
                     "#cobblemon:is_overworld"
                 ],
-                "maxLight": 7
+                "maxLight": 0
             },
             "anticondition": {
                 "biomes": [
@@ -88,6 +88,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "maxLight": 7
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -107,6 +112,36 @@
                     "isPokeSnack": true
                 }
             },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "gastly-5",
+            "pokemon": "gastly",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "6-31",
+            "weight": 72.0,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "biomes": [
                     "#minecraft:is_nether"

common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json

@@ -27,7 +27,7 @@
                     "#aether:is_aether",
                     "#cobblemon:is_overworld"
                 ],
-                "maxLight": 7
+                "maxLight": 0
             },
             "anticondition": {
                 "biomes": [
@@ -88,6 +88,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "maxLight": 7
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -107,6 +112,36 @@
                     "isPokeSnack": true
                 }
             },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "haunter-5",
+            "pokemon": "haunter",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "25-41",
+            "weight": 7.6,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "biomes": [
                     "#minecraft:is_nether"

common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json

@@ -27,7 +27,7 @@
                     "#aether:is_aether",
                     "#cobblemon:is_overworld"
                 ],
-                "maxLight": 7
+                "maxLight": 0
             },
             "anticondition": {
                 "biomes": [
@@ -88,6 +88,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "maxLight": 7
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -107,6 +112,36 @@
                     "isPokeSnack": true
                 }
             },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "gengar-5",
+            "pokemon": "gengar",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "36-50",
+            "weight": 0.4,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "biomes": [
                     "#minecraft:is_nether"

common/src/main/resources/data/cobblemon/spawn_pool_world/0096_drowzee.json

@@ -48,7 +48,7 @@
                 ],
                 "timeRange": "night",
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0097_hypno.json

@@ -48,7 +48,7 @@
                 ],
                 "timeRange": "night",
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0100_voltorb.json

@@ -69,7 +69,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0101_electrode.json

@@ -69,7 +69,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json

@@ -36,7 +36,37 @@
             }
         },
         {
-            "id": "cubone-alola-2",
+            "id": "cubone-2",
+            "pokemon": "cubone",
+            "presets": [
+                "natural",
+                "wild"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "7-32",
+            "weight": 43.2,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "cubone-alola-3",
             "pokemon": "cubone region_bias=alola",
             "presets": [
                 "natural",
@@ -62,7 +92,7 @@
             }
         },
         {
-            "id": "cubone-alola-3",
+            "id": "cubone-alola-4",
             "pokemon": "cubone region_bias=alola",
             "presets": [
                 "natural",

common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json

@@ -36,7 +36,37 @@
             }
         },
         {
-            "id": "marowak-alolan-2",
+            "id": "marowak-2",
+            "pokemon": "marowak",
+            "presets": [
+                "natural",
+                "wild"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "28-43",
+            "weight": 4.8,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "marowak-alolan-3",
             "pokemon": "marowak alolan",
             "presets": [
                 "natural",
@@ -62,7 +92,7 @@
             }
         },
         {
-            "id": "marowak-alolan-3",
+            "id": "marowak-alolan-4",
             "pokemon": "marowak alolan",
             "presets": [
                 "natural",

common/src/main/resources/data/cobblemon/spawn_pool_world/0109_koffing.json

@@ -75,7 +75,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0110_weezing.json

@@ -69,7 +69,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json

@@ -53,7 +53,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0122_mrmime.json

@@ -58,7 +58,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -141,7 +141,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0124_jynx.json

@@ -69,7 +69,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json

@@ -118,7 +118,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0134_vaporeon.json

@@ -124,7 +124,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0135_jolteon.json

@@ -78,7 +78,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json

@@ -79,7 +79,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json

@@ -186,8 +186,7 @@
             "id": "dratini-7",
             "pokemon": "dratini",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -204,7 +203,11 @@
                 "canSeeSky": true,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {
@@ -252,8 +255,7 @@
             "id": "dratini-10",
             "pokemon": "dratini",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -272,7 +274,11 @@
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json

@@ -186,8 +186,7 @@
             "id": "dragonair-7",
             "pokemon": "dragonair",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -204,7 +203,11 @@
                 "canSeeSky": true,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {
@@ -252,8 +255,7 @@
             "id": "dragonair-10",
             "pokemon": "dragonair",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -272,7 +274,11 @@
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json

@@ -135,8 +135,7 @@
             "id": "dragonite-7",
             "pokemon": "dragonite",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -147,7 +146,11 @@
                 "canSeeSky": true,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {
@@ -195,8 +198,7 @@
             "id": "dragonite-10",
             "pokemon": "dragonite",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -209,7 +211,11 @@
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0167_spinarak.json

@@ -27,6 +27,10 @@
                 "isRaining": false
             },
             "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ],
                 "biomes": [
                     "#cobblemon:is_freezing"
                 ]
@@ -102,6 +106,37 @@
         {
             "id": "spinarak-5",
             "pokemon": "spinarak",
+            "presets": [
+                "natural",
+                "treetop"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "1-25",
+            "weight": 54.0,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            },
+            "anticondition": {
+                "biomes": [
+                    "#cobblemon:is_freezing"
+                ]
+            }
+        },
+        {
+            "id": "spinarak-6",
+            "pokemon": "spinarak",
             "presets": [
                 "mansion"
             ],
@@ -118,11 +153,6 @@
                 "neededNearbyBlocks": [
                     "minecraft:cobweb"
                 ]
-            },
-            "anticondition": {
-                "biomes": [
-                    "minecraft:sulfur_caves"
-                ]
             }
         }
     ]

common/src/main/resources/data/cobblemon/spawn_pool_world/0168_ariados.json

@@ -33,6 +33,10 @@
                 "isRaining": false
             },
             "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ],
                 "biomes": [
                     "#cobblemon:is_freezing"
                 ]
@@ -126,6 +130,43 @@
         {
             "id": "ariados-5",
             "pokemon": "ariados",
+            "presets": [
+                "natural",
+                "treetop"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "22-40",
+            "weight": 4.8,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            },
+            "anticondition": {
+                "biomes": [
+                    "#cobblemon:is_freezing"
+                ]
+            }
+        },
+        {
+            "id": "ariados-6",
+            "pokemon": "ariados",
             "presets": [
                 "mansion"
             ],
@@ -148,11 +189,6 @@
                 "neededNearbyBlocks": [
                     "minecraft:cobweb"
                 ]
-            },
-            "anticondition": {
-                "biomes": [
-                    "minecraft:sulfur_caves"
-                ]
             }
         }
     ]

common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json

@@ -31,6 +31,9 @@
                 "isRaining": false
             },
             "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
                 "biomes": [
                     "#cobblemon:is_spooky",
                     "#cobblemon:is_freezing"
@@ -188,6 +191,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "isRaining": false
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -232,6 +240,37 @@
                     "isPokeSnack": true
                 }
             },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "isRaining": false,
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "crobat-8",
+            "pokemon": "crobat",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "41-54",
+            "weight": 0.3,
+            "weightMultiplier": {
+                "multiplier": 2.0,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "minSkyLight": 0,
                 "maxSkyLight": 7,

common/src/main/resources/data/cobblemon/spawn_pool_world/0196_espeon.json

@@ -78,7 +78,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0197_umbreon.json

@@ -78,7 +78,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0198_murkrow.json

@@ -28,6 +28,12 @@
                     "#cobblemon:is_spooky"
                 ],
                 "isPokeSnack": true
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -52,6 +58,12 @@
                 ],
                 "timeRange": "night",
                 "isPokeSnack": true
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -66,6 +78,38 @@
             "bucket": "common",
             "level": "16-41",
             "weight": 57.0,
+            "weightMultiplier": {
+                "multiplier": 1.5,
+                "condition": {
+                    "timeRange": "night"
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62,
+                "isPokeSnack": true
+            }
+        },
+        {
+            "id": "murkrow-4",
+            "pokemon": "murkrow",
+            "presets": [
+                "natural",
+                "treetop"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "16-41",
+            "weight": 57.0,
             "condition": {
                 "minSkyLight": 8,
                 "maxSkyLight": 15,

common/src/main/resources/data/cobblemon/spawn_pool_world/0200_misdreavus.json

@@ -119,6 +119,11 @@
                     "#cobblemon:is_swamp"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure"
+                ]
             }
         },
         {
@@ -131,6 +136,36 @@
             "spawnablePositionType": "grounded",
             "bucket": "common",
             "level": "19-44",
+            "weight": 76.0,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "misdreavus-6",
+            "pokemon": "misdreavus",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "19-44",
             "weight": 45.6,
             "weightMultiplier": {
                 "multiplier": 1.25,
@@ -145,7 +180,7 @@
             }
         },
         {
-            "id": "misdreavus-6",
+            "id": "misdreavus-7",
             "pokemon": "misdreavus",
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -168,11 +203,6 @@
                 ],
                 "minY": -41,
                 "maxY": 9
-            },
-            "anticondition": {
-                "biomes": [
-                    "#cobblemon:is_deep_dark"
-                ]
             }
         }
     ]

common/src/main/resources/data/cobblemon/spawn_pool_world/0209_snubbull.json

@@ -46,7 +46,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0210_granbull.json

@@ -58,7 +58,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0211_qwilfish.json

@@ -29,7 +29,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -37,8 +37,7 @@
             "id": "qwilfish-2",
             "pokemon": "qwilfish",
             "presets": [
-                "water",
-                "ocean_monument"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -55,7 +54,11 @@
                 "canSeeSky": true,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_monument"
+                ],
+                "maxY": 62
             },
             "anticondition": {
                 "biomes": [
@@ -82,7 +85,7 @@
             "anticondition": {
                 "minLureLevel": 1,
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -111,7 +114,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -136,7 +139,7 @@
                     "#cobblemon:is_ocean"
                 ],
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             },
             "anticondition": {
@@ -174,7 +177,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -182,8 +185,7 @@
             "id": "qwilfish-7",
             "pokemon": "qwilfish",
             "presets": [
-                "water",
-                "ocean_monument"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -202,7 +204,11 @@
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_monument"
+                ],
+                "maxY": 62
             },
             "anticondition": {
                 "biomes": [
@@ -231,7 +237,7 @@
             "anticondition": {
                 "minLureLevel": 1,
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -262,7 +268,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -289,7 +295,7 @@
                     "#cobblemon:is_ocean"
                 ],
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             },
             "anticondition": {
@@ -417,7 +423,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -425,8 +431,7 @@
             "id": "qwilfish-hisuian-15",
             "pokemon": "qwilfish hisuian",
             "presets": [
-                "water",
-                "ocean_monument"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -444,7 +449,11 @@
                 "biomes": [
                     "#cobblemon:is_cold_ocean",
                     "#cobblemon:is_frozen_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_monument"
+                ],
+                "maxY": 62
             }
         },
         {
@@ -464,7 +473,7 @@
             "anticondition": {
                 "minLureLevel": 1,
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -492,7 +501,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -518,7 +527,7 @@
                     "#cobblemon:is_frozen_ocean"
                 ],
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -549,7 +558,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -557,8 +566,7 @@
             "id": "qwilfish-hisuian-20",
             "pokemon": "qwilfish hisuian",
             "presets": [
-                "water",
-                "ocean_monument"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -578,7 +586,11 @@
                 "biomes": [
                     "#cobblemon:is_cold_ocean",
                     "#cobblemon:is_frozen_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_monument"
+                ],
+                "maxY": 62
             }
         },
         {
@@ -600,7 +612,7 @@
             "anticondition": {
                 "minLureLevel": 1,
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -630,7 +642,7 @@
             },
             "anticondition": {
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },
@@ -658,7 +670,7 @@
                     "#cobblemon:is_frozen_ocean"
                 ],
                 "structures": [
-                    "minecraft:monument"
+                    "#cobblemon:spawns/is_ocean_monument"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0235_smeargle.json

@@ -53,7 +53,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json

@@ -53,7 +53,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0261_poochyena.json

@@ -29,8 +29,7 @@
             "id": "poochyena-2",
             "pokemon": "poochyena",
             "presets": [
-                "natural",
-                "pillager_outpost"
+                "natural"
             ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -43,6 +42,10 @@
                 "biomes": [
                     "#cobblemon:is_overworld"
                 ],
+                "structures": [
+                    "#cobblemon:spawns/is_illager_outpost"
+                ],
+                "minY": 62,
                 "isPokeSnack": true
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0262_mightyena.json

@@ -29,8 +29,7 @@
             "id": "mightyena-2",
             "pokemon": "mightyena",
             "presets": [
-                "natural",
-                "pillager_outpost"
+                "natural"
             ],
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -43,6 +42,10 @@
                 "biomes": [
                     "#cobblemon:is_overworld"
                 ],
+                "structures": [
+                    "#cobblemon:spawns/is_illager_outpost"
+                ],
+                "minY": 62,
                 "isPokeSnack": true
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json

@@ -66,7 +66,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ],
                 "isPokeSnack": true
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json

@@ -66,7 +66,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ],
                 "isPokeSnack": true
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json

@@ -66,7 +66,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ],
                 "isPokeSnack": true
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json

@@ -28,7 +28,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -114,7 +114,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json

@@ -36,7 +36,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -144,7 +144,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0307_meditite.json

@@ -49,6 +49,37 @@
             "condition": {
                 "biomes": [
                     "#cobblemon:is_overworld"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
+                ]
+            }
+        },
+        {
+            "id": "meditite-3",
+            "pokemon": "meditite",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "5-30",
+            "weight": 540.0,
+            "weightMultiplier": {
+                "multiplier": 0.25,
+                "condition": {
+                    "timeRange": "night"
+                }
+            },
+            "condition": {
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
                 ],
                 "minY": 48
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0308_medicham.json

@@ -65,6 +65,45 @@
             "condition": {
                 "biomes": [
                     "#cobblemon:is_overworld"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
+                ]
+            }
+        },
+        {
+            "id": "medicham-3",
+            "pokemon": "medicham",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "37-43",
+            "weight": 30.0,
+            "weightMultipliers": [
+                {
+                    "multiplier": 0.25,
+                    "condition": {
+                        "timeRange": "night"
+                    }
+                },
+                {
+                    "multiplier": 2.0,
+                    "condition": {
+                        "isPokeSnack": true
+                    }
+                }
+            ],
+            "condition": {
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
                 ],
                 "minY": 48
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json

@@ -45,12 +45,38 @@
                 "canSeeSky": false,
                 "biomes": [
                     "#cobblemon:is_overworld"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_desert_monument"
+                ]
+            }
+        },
+        {
+            "id": "baltoy-3",
+            "pokemon": "baltoy",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "5-30",
+            "weight": 540.0,
+            "condition": {
+                "canSeeSky": false,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_desert_monument"
                 ],
                 "minY": 48
             }
         },
         {
-            "id": "baltoy-3",
+            "id": "baltoy-4",
             "pokemon": "baltoy",
             "type": "pokemon",
             "spawnablePositionType": "grounded",

common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json

@@ -57,12 +57,44 @@
                 "canSeeSky": false,
                 "biomes": [
                     "#cobblemon:is_overworld"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_desert_monument"
+                ]
+            }
+        },
+        {
+            "id": "claydol-3",
+            "pokemon": "claydol",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "36-50",
+            "weight": 48.0,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
+            "condition": {
+                "canSeeSky": false,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_desert_monument"
                 ],
                 "minY": 48
             }
         },
         {
-            "id": "claydol-3",
+            "id": "claydol-4",
             "pokemon": "claydol",
             "type": "pokemon",
             "spawnablePositionType": "grounded",

common/src/main/resources/data/cobblemon/spawn_pool_world/0353_shuppet.json

@@ -81,7 +81,7 @@
                 ],
                 "timeRange": "night",
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0354_banette.json

@@ -63,7 +63,7 @@
                 ],
                 "timeRange": "night",
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json

@@ -21,6 +21,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -34,6 +39,30 @@
             "bucket": "common",
             "level": "5-30",
             "weight": 90.0,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "duskull-3",
+            "pokemon": "duskull",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "5-30",
+            "weight": 90.0,
             "condition": {
                 "biomes": [
                     "#cobblemon:nether/is_soul_sand"

common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json

@@ -21,6 +21,11 @@
                     "#cobblemon:is_spooky"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -34,6 +39,30 @@
             "bucket": "common",
             "level": "37-46",
             "weight": 9.5,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "dusclops-3",
+            "pokemon": "dusclops",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "37-46",
+            "weight": 9.5,
             "condition": {
                 "biomes": [
                     "#cobblemon:nether/is_soul_sand"

common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json

@@ -32,6 +32,9 @@
                 "timeRange": "night"
             },
             "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
                 "biomes": [
                     "#cobblemon:is_volcanic"
                 ]
@@ -61,11 +64,53 @@
                     "#cobblemon:is_magical"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
             "id": "chimecho-3",
             "pokemon": "chimecho",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "24-46",
+            "weight": 37.0,
+            "weightMultipliers": [
+                {
+                    "multiplier": 0.25,
+                    "condition": {
+                        "timeRange": "day"
+                    }
+                },
+                {
+                    "multiplier": 2.0,
+                    "condition": {
+                        "isPokeSnack": true
+                    }
+                }
+            ],
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "chimecho-4",
+            "pokemon": "chimecho",
             "type": "pokemon",
             "spawnablePositionType": "grounded",
             "bucket": "uncommon",

common/src/main/resources/data/cobblemon/spawn_pool_world/0361_snorunt.json

@@ -80,8 +80,9 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "minecraft:igloo"
-                ]
+                    "#cobblemon:spawns/is_igloo"
+                ],
+                "minY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json

@@ -31,8 +31,7 @@
             "id": "relicanth-2",
             "pokemon": "relicanth",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -49,7 +48,11 @@
                 "canSeeSky": true,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {
@@ -203,8 +206,7 @@
             "id": "relicanth-9",
             "pokemon": "relicanth",
             "presets": [
-                "water",
-                "ocean_ruins"
+                "water"
             ],
             "type": "pokemon",
             "spawnablePositionType": "submerged",
@@ -223,7 +225,11 @@
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_ocean"
-                ]
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_ocean_ruins"
+                ],
+                "maxY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0429_mismagius.json

@@ -119,6 +119,11 @@
                     "#cobblemon:is_swamp"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure"
+                ]
             }
         },
         {
@@ -131,6 +136,36 @@
             "spawnablePositionType": "grounded",
             "bucket": "common",
             "level": "39-50",
+            "weight": 4.0,
+            "weightMultiplier": {
+                "multiplier": 1.25,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "mismagius-6",
+            "pokemon": "mismagius",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "39-50",
             "weight": 2.4,
             "weightMultiplier": {
                 "multiplier": 1.25,
@@ -145,7 +180,7 @@
             }
         },
         {
-            "id": "mismagius-6",
+            "id": "mismagius-7",
             "pokemon": "mismagius",
             "type": "pokemon",
             "spawnablePositionType": "grounded",

common/src/main/resources/data/cobblemon/spawn_pool_world/0430_honchkrow.json

@@ -26,6 +26,13 @@
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_spooky"
+                ],
+                "isPokeSnack": true
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
                 ]
             }
         },
@@ -49,7 +56,14 @@
                     "#cobblemon:is_swamp",
                     "#cobblemon:is_taiga"
                 ],
-                "timeRange": "night"
+                "timeRange": "night",
+                "isPokeSnack": true
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -64,13 +78,46 @@
             "bucket": "common",
             "level": "36-51",
             "weight": 3.0,
+            "weightMultiplier": {
+                "multiplier": 1.5,
+                "condition": {
+                    "timeRange": "night"
+                }
+            },
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_witch_structure",
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62,
+                "isPokeSnack": true
+            }
+        },
+        {
+            "id": "honchkrow-4",
+            "pokemon": "honchkrow",
+            "presets": [
+                "natural",
+                "treetop"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "36-51",
+            "weight": 3.0,
             "condition": {
                 "minSkyLight": 8,
                 "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:is_sky"
                 ],
-                "timeRange": "night"
+                "timeRange": "night",
+                "isPokeSnack": true
             }
         }
     ]

common/src/main/resources/data/cobblemon/spawn_pool_world/0431_glameow.json

@@ -61,7 +61,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -123,7 +123,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0432_purugly.json

@@ -61,7 +61,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -123,7 +123,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json

@@ -14,6 +14,12 @@
             "bucket": "uncommon",
             "level": "4-29",
             "weight": 2.6,
+            "weightMultiplier": {
+                "multiplier": 2.0,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "minSkyLight": 8,
                 "maxSkyLight": 15,
@@ -24,6 +30,11 @@
                     "#cobblemon:is_taiga"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
@@ -37,6 +48,12 @@
             "bucket": "uncommon",
             "level": "4-29",
             "weight": 7.8,
+            "weightMultiplier": {
+                "multiplier": 2.0,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "minSkyLight": 8,
                 "maxSkyLight": 15,
@@ -44,16 +61,64 @@
                     "#cobblemon:is_magical"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
             }
         },
         {
             "id": "chingling-3",
             "pokemon": "chingling",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "uncommon",
+            "level": "4-29",
+            "weight": 13.0,
+            "weightMultipliers": [
+                {
+                    "multiplier": 0.25,
+                    "condition": {
+                        "timeRange": "day"
+                    }
+                },
+                {
+                    "multiplier": 2.0,
+                    "condition": {
+                        "isPokeSnack": true
+                    }
+                }
+            ],
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
+            }
+        },
+        {
+            "id": "chingling-4",
+            "pokemon": "chingling",
             "type": "pokemon",
             "spawnablePositionType": "grounded",
             "bucket": "uncommon",
             "level": "4-29",
             "weight": 130.0,
+            "weightMultiplier": {
+                "multiplier": 2.0,
+                "condition": {
+                    "isPokeSnack": true
+                }
+            },
             "condition": {
                 "biomes": [
                     "#cobblemon:is_overworld"

common/src/main/resources/data/cobblemon/spawn_pool_world/0436_bronzor.json

@@ -44,12 +44,37 @@
             "condition": {
                 "biomes": [
                     "#cobblemon:is_overworld"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
+                ]
+            }
+        },
+        {
+            "id": "bronzor-3",
+            "pokemon": "bronzor",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "5-30",
+            "weight": 504.0,
+            "condition": {
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
                 ],
                 "minY": 48
             }
         },
         {
-            "id": "bronzor-3",
+            "id": "bronzor-4",
             "pokemon": "bronzor",
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -61,14 +86,14 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#cobblemon:ruin"
+                    "#cobblemon:spawns/is_ruins"
                 ],
                 "minY": -37,
                 "maxY": 10
             }
         },
         {
-            "id": "bronzor-4",
+            "id": "bronzor-5",
             "pokemon": "bronzor",
             "presets": [
                 "trail_ruins"
@@ -86,7 +111,7 @@
             }
         },
         {
-            "id": "bronzor-5",
+            "id": "bronzor-6",
             "pokemon": "bronzor",
             "type": "pokemon",
             "spawnablePositionType": "grounded",

common/src/main/resources/data/cobblemon/spawn_pool_world/0437_bronzong.json

@@ -44,12 +44,37 @@
             "condition": {
                 "biomes": [
                     "#cobblemon:is_overworld"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
+                ]
+            }
+        },
+        {
+            "id": "bronzong-3",
+            "pokemon": "bronzong",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "33-50",
+            "weight": 76.8,
+            "condition": {
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
                 ],
                 "minY": 48
             }
         },
         {
-            "id": "bronzong-3",
+            "id": "bronzong-4",
             "pokemon": "bronzong",
             "type": "pokemon",
             "spawnablePositionType": "grounded",
@@ -61,14 +86,14 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#cobblemon:ruin"
+                    "#cobblemon:spawns/is_ruins"
                 ],
                 "minY": -37,
                 "maxY": 10
             }
         },
         {
-            "id": "bronzong-4",
+            "id": "bronzong-5",
             "pokemon": "bronzong",
             "presets": [
                 "trail_ruins"
@@ -86,7 +111,7 @@
             }
         },
         {
-            "id": "bronzong-5",
+            "id": "bronzong-6",
             "pokemon": "bronzong",
             "type": "pokemon",
             "spawnablePositionType": "grounded",

common/src/main/resources/data/cobblemon/spawn_pool_world/0439_mimejr.json

@@ -46,7 +46,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -111,7 +111,7 @@
                     "#cobblemon:is_freezing"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         }

common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json

@@ -54,7 +54,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ],
                 "isPokeSnack": true
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0442_spiritomb.json

@@ -35,7 +35,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#cobblemon:ruin"
+                    "#cobblemon:spawns/is_ruins"
                 ],
                 "minY": 48
             }
@@ -93,12 +93,38 @@
                 "canSeeSky": false,
                 "biomes": [
                     "#cobblemon:is_jungle"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
+                ]
+            }
+        },
+        {
+            "id": "spiritomb-6",
+            "pokemon": "spiritomb",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "rare",
+            "level": "24-49",
+            "weight": 1000.0,
+            "condition": {
+                "canSeeSky": false,
+                "biomes": [
+                    "#cobblemon:is_jungle"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_jungle_monument"
                 ],
                 "minY": 48
             }
         },
         {
-            "id": "spiritomb-6",
+            "id": "spiritomb-7",
             "pokemon": "spiritomb",
             "presets": [
                 "natural",
@@ -113,12 +139,38 @@
                 "canSeeSky": false,
                 "biomes": [
                     "#cobblemon:is_desert"
+                ]
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_desert_monument"
+                ]
+            }
+        },
+        {
+            "id": "spiritomb-8",
+            "pokemon": "spiritomb",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "rare",
+            "level": "24-49",
+            "weight": 1000.0,
+            "condition": {
+                "canSeeSky": false,
+                "biomes": [
+                    "#cobblemon:is_desert"
+                ],
+                "structures": [
+                    "#cobblemon:spawns/is_desert_monument"
                 ],
                 "minY": 48
             }
         },
         {
-            "id": "spiritomb-7",
+            "id": "spiritomb-9",
             "pokemon": "spiritomb",
             "type": "pokemon",
             "spawnablePositionType": "grounded",

common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json

@@ -69,7 +69,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0471_glaceon.json

@@ -60,7 +60,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },

common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json

@@ -66,7 +66,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ],
                 "isPokeSnack": true
             }

common/src/main/resources/data/cobblemon/spawn_pool_world/0477_dusknoir.json

@@ -21,6 +21,35 @@
                     "#cobblemon:is_spooky"
                 ],
                 "timeRange": "night"
+            },
+            "anticondition": {
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ]
+            }
+        },
+        {
+            "id": "dusknoir-2",
+            "pokemon": "dusknoir",
+            "presets": [
+                "natural"
+            ],
+            "type": "pokemon",
+            "spawnablePositionType": "grounded",
+            "bucket": "common",
+            "level": "41-53",
+            "weight": 0.5,
+            "condition": {
+                "minSkyLight": 8,
+                "maxSkyLight": 15,
+                "biomes": [
+                    "#cobblemon:is_overworld"
+                ],
+                "timeRange": "night",
+                "structures": [
+                    "#cobblemon:spawns/is_graveyard"
+                ],
+                "minY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0478_froslass.json

@@ -81,8 +81,9 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "minecraft:igloo"
-                ]
+                    "#cobblemon:spawns/is_igloo"
+                ],
+                "minY": 62
             }
         },
         {

common/src/main/resources/data/cobblemon/spawn_pool_world/0506_lillipup.json

@@ -46,7 +46,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0507_herdier.json

@@ -58,7 +58,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0508_stoutland.json

@@ -58,7 +58,7 @@
                     "#cobblemon:is_overworld"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {

common/src/main/resources/data/cobblemon/spawn_pool_world/0509_purrloin.json

@@ -115,7 +115,7 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             },
             "anticondition": {
@@ -176,7 +176,7 @@
                     "#cobblemon:is_savanna"
                 ],
                 "structures": [
-                    "#minecraft:village"
+                    "#cobblemon:spawns/is_civilization"
                 ]
             }
         },
@@ -223,8 +223,9 @@
                 ],
                 "isRaining": false,
                 "structures": [
-                    "minecraft:swamp_hut"
-                ]
+                    "#cobblemon:spawns/is_witch_structure"
+                ],
+                "minY": 62
             }
         }
     ]