diff --git a/common/src/main/resources/data/cobblemon/loot_table/injection/chests/jungle_temple.json b/common/src/main/resources/data/cobblemon/loot_table/injection/chests/jungle_temple.json index d365e84b0a..138aac712e 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/injection/chests/jungle_temple.json +++ b/common/src/main/resources/data/cobblemon/loot_table/injection/chests/jungle_temple.json @@ -25,6 +25,32 @@ "chance": 0.273 } ] + }, + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "cobblemon:technical_machine", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "cobblemon:tm_move": { + "move": "grasspledge" + } + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.45 + } + ] } ] } diff --git a/common/src/main/resources/data/cobblemon/loot_table/injection/chests/nether_bridge.json b/common/src/main/resources/data/cobblemon/loot_table/injection/chests/nether_bridge.json index d17747dc9d..46ac17e11f 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/injection/chests/nether_bridge.json +++ b/common/src/main/resources/data/cobblemon/loot_table/injection/chests/nether_bridge.json @@ -22,6 +22,32 @@ "chance": 0.45 } ] + }, + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "cobblemon:technical_machine", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "cobblemon:tm_move": { + "move": "firepledge" + } + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.45 + } + ] } ] } diff --git a/common/src/main/resources/data/cobblemon/loot_table/injection/chests/shipwreck_supply.json b/common/src/main/resources/data/cobblemon/loot_table/injection/chests/shipwreck_supply.json index d365e84b0a..90c7aa4261 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/injection/chests/shipwreck_supply.json +++ b/common/src/main/resources/data/cobblemon/loot_table/injection/chests/shipwreck_supply.json @@ -25,6 +25,32 @@ "chance": 0.273 } ] + }, + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "cobblemon:technical_machine", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "cobblemon:tm_move": { + "move": "waterpledge" + } + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.45 + } + ] } ] } diff --git a/common/src/main/resources/data/cobblemon/loot_table/ruins/gilded_chests/ruins.json b/common/src/main/resources/data/cobblemon/loot_table/ruins/gilded_chests/ruins.json index d12589588b..446ed35d3a 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/ruins/gilded_chests/ruins.json +++ b/common/src/main/resources/data/cobblemon/loot_table/ruins/gilded_chests/ruins.json @@ -217,30 +217,6 @@ "weight": 1 } ] - }, - { - "rolls": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 1.0 - }, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "cobblemon:technical_machine", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "cobblemon:tm_move": { - "move": "lashout" - } - } - } - ] - } - ] } ], "random_sequence": "cobblemon:ruins/gilded_chests/ruins" diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_1.nbt deleted file mode 100644 index ebc17ce9c6..0000000000 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_1.nbt and /dev/null differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_2.nbt deleted file mode 100644 index 001275a0d4..0000000000 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_2.nbt and /dev/null differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_3.nbt deleted file mode 100644 index 4a14355e12..0000000000 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/dead_coral/dead_coral_3.nbt and /dev/null differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/stone_pillar1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/decorations/stone_pillar1.nbt deleted file mode 100644 index 94a8b3135e..0000000000 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/decorations/stone_pillar1.nbt and /dev/null differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/dripstone_oasis1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/dripstone_oasis1.nbt index 13ea9dceeb..afb691624c 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/dripstone_oasis1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/dripstone_oasis1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/enhydro_agate.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/enhydro_agate.nbt index 685620f010..a2d9e51e2a 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/enhydro_agate.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/enhydro_agate.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar1.nbt index a679c0543a..17e862f9a9 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar2.nbt index 827ec6f476..b34198724b 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar3.nbt index 6b79265a0f..2c1c8211b5 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar3.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/eroded_pillar3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond.nbt index 1dcd394bf0..ac2082a0be 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond2.nbt index ad9efc0b6b..329cc40db6 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_pond2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike.nbt index 891f662bf0..a6f4650cb0 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_large.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_large.nbt index 41c54cf789..e7e54f5727 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_large.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_large.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_medium.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_medium.nbt index f0265c7a55..53f3b90e82 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_medium.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_medium.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_tiny.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_tiny.nbt index 8fb474f79b..56a955d519 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_tiny.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/frozen_spike_tiny.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_large.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_large.nbt index f02c2c50fd..a4e6aa964e 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_large.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_large.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_medium.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_medium.nbt index 78553bd996..27d8159f46 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_medium.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_medium.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_small.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_small.nbt index 882fc787ff..07ff9585fc 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_small.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/hydrothermal_vents_small.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/lush_den.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/lush_den.nbt index 5df3b717db..cb6b65c2e4 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/lush_den.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/lush_den.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond1.nbt new file mode 100644 index 0000000000..e6dfa217ee Binary files /dev/null and b/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond2.nbt index 6425e016e2..43a2e60485 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/mossy_pond2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit1.nbt index 0ab276d0ae..c1aabd91a5 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit2.nbt index 362f237c4a..bdce1b6921 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit3.nbt index 39dbc8ab3c..089be21f2b 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit3.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/rooted_pit3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sandy_den.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sandy_den.nbt index 8bdfc2ad4d..a35fb63968 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sandy_den.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sandy_den.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact1.nbt index 778924251e..a628d4a91d 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact2.nbt index 72cb79aee8..d4c7a42a3a 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact3.nbt index 2e406aa500..abae95f81e 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact3.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_impact3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike1.nbt index be3f39b6dc..8c037ae75e 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike2.nbt index f8adfefefd..affee89705 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/submerged_spike2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_den.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_den.nbt index 918762897d..a1511cfd71 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_den.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_den.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains1.nbt index e011a905bd..c800b5816b 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains2.nbt index 7615fe2502..79a9745528 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains3.nbt index e4acf806b4..de8db4e79f 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains3.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains4.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains4.nbt index c01ba9f78e..ec1f051ad1 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains4.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains4.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains5.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains5.nbt index 114ee05c37..6ec4ecb0c3 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains5.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/sunscorched_remains5.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound1.nbt index d90e149c6f..0c948bbe1a 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound2.nbt index c8a709f7f2..c4069b247c 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound3.nbt index c810113413..56ef3f31bf 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound3.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/suspicious_mound3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure1.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure1.nbt index 1f236ab996..1c3fd8adc8 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure1.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure2.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure2.nbt index fab45db376..79075e12ad 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure2.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure3.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure3.nbt index 90cb82ec98..fb882a2049 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure3.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/underwater_fissure3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_large.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_large.nbt index 2c35031030..0d16d377da 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_large.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_large.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_medium.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_medium.nbt index c5f3664cc8..65cd7ea63f 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_medium.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_medium.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_small.nbt b/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_small.nbt index 540e0708ab..905141908d 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_small.nbt and b/common/src/main/resources/data/cobblemon/structure/fossils/vibrant_hydrothermal_vents_small.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling4.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling4.nbt index cc8f9c59bb..9da5ac0038 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling4.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling4.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling5.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling5.nbt index 0cacee270c..5d286a175d 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling5.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/fungal_dwelling5.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery3.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery3.nbt index 7f31e9e74c..22d28f7c8c 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery3.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery4.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery4.nbt index 492500740a..afbf7a9cd2 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery4.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery4.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery5.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery5.nbt index c87726dca0..13aa3e4225 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery5.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery5.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery6.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery6.nbt index 5f423567e8..1c1d1db914 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery6.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery6.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery7.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery7.nbt index b60d60c8f2..6c0398e097 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery7.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery7.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery8.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery8.nbt index 4d43eb6f46..22a7a21662 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery8.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/root_nursery8.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall1.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall1.nbt index 5855cab5fc..b1c78f90b6 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall1.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall2.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall2.nbt index 8bf61761bb..1dac6d4cdb 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall2.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall3.nbt b/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall3.nbt index be40d32dce..c16b7398bc 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall3.nbt and b/common/src/main/resources/data/cobblemon/structure/habitats/skeletal_fall3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt1.nbt b/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt1.nbt index 05d2420106..116dd45259 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt1.nbt and b/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt2.nbt b/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt2.nbt index 425c9baa41..771badf0aa 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt2.nbt and b/common/src/main/resources/data/cobblemon/structure/ruins/deep_crypt2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner6.nbt b/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner6.nbt index 33cf0f9fd3..64ef32d011 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner6.nbt and b/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner6.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner7.nbt b/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner7.nbt index 06cb16c13a..547a4be612 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner7.nbt and b/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner7.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner8.nbt b/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner8.nbt index c15f30d5e8..6a70fca74a 100644 Binary files a/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner8.nbt and b/common/src/main/resources/data/cobblemon/structure/shipwreck_coves/cove2/corner8.nbt differ diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/structure/habitats/habitats.json b/common/src/main/resources/data/cobblemon/tags/worldgen/structure/habitats/habitats.json index 2d96994d47..11e9b64c5e 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/structure/habitats/habitats.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/structure/habitats/habitats.json @@ -22,8 +22,8 @@ "cobblemon:habitats/oak_wildfire_scar", "cobblemon:habitats/parched_peat_bog", "cobblemon:habitats/pinkflowerbed_clearing", - "cobblemon:habitats/reclaimed_deserted_monument_ruins", - "cobblemon:habitats/reclaimed_lush_monument_ruins", + "cobblemon:habitats/reclaimed_deserted_monument", + "cobblemon:habitats/reclaimed_lush_monument", "cobblemon:habitats/rocky_outcrop", "cobblemon:habitats/sandpit_clearing", "cobblemon:habitats/snowy_burrow", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_enhydro_agate.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_enhydro_agate.json index ee4ff2be04..002c7f7257 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_enhydro_agate.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_enhydro_agate.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 2 + "chance": 1 }, { "type": "minecraft:height_range", @@ -45,7 +45,7 @@ ], "offset": [ 0, - -1, + 1, 0 ] } diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/abandoned_fortress.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/abandoned_fortress.json index 8f29ed4d3f..968d6e81ce 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/abandoned_fortress.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/abandoned_fortress.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 40 + "chance": 150 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/ancient_wellsprings.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/ancient_wellsprings.json index a5a2ca47f7..859624a120 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/ancient_wellsprings.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/ancient_wellsprings.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 5 + "chance": 15 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/chorus_briars.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/chorus_briars.json index 30e391c842..e44ad4b029 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/chorus_briars.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/chorus_briars.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 200 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/deep_roots.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/deep_roots.json index 7bf476cc68..8a96d7706c 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/deep_roots.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/deep_roots.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 5 + "chance": 40 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/earthen_hives.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/earthen_hives.json index 5b20c09151..0805efb922 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/earthen_hives.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/earthen_hives.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 5 + "chance": 40 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/lost_ruins.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/lost_ruins.json index 5aa442a9cb..e997392f8e 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/lost_ruins.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/lost_ruins.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 20 + "chance": 60 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/quartz_spikes.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/quartz_spikes.json index 79f44e45f1..5facefeb2f 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/quartz_spikes.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/quartz_spikes.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 10 + "chance": 120 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/rocky_tidepools.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/rocky_tidepools.json index 4312677452..b28cd1af36 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/rocky_tidepools.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/rocky_tidepools.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 10 + "chance": 20 }, { "type": "minecraft:biome" diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/root_nurseries.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/root_nurseries.json index 917f8447fb..7d98b9c0cd 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/root_nurseries.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/root_nurseries.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 30 + "chance": 45 }, { "type": "minecraft:biome" diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/sandy_tidepools.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/sandy_tidepools.json index 531a6a982c..3ef3124d88 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/sandy_tidepools.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/sandy_tidepools.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 5 + "chance": 10 }, { "type": "minecraft:biome" diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/skeletal_fall.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/skeletal_fall.json index 8641d57284..5ab02e4f25 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/skeletal_fall.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/skeletal_fall.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 40 + "chance": 85 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/strange_fungal_dwellings.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/strange_fungal_dwellings.json index ca68f2bc85..35c0d3619d 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/strange_fungal_dwellings.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/strange_fungal_dwellings.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 40 + "chance": 100 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/treasure_hoard.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/treasure_hoard.json index c798612874..9351c0886e 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/treasure_hoard.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/treasure_hoard.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 30 + "chance": 80 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/volcanic_plumes.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/volcanic_plumes.json index 85d832247f..d70714accc 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/volcanic_plumes.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/volcanic_plumes.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 40 + "chance": 140 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/crumbling_arch.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/crumbling_arch.json index 0853ef4458..31fe2ab690 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/crumbling_arch.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/crumbling_arch.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 20 + "chance": 60 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/rooted_arch.json b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/rooted_arch.json index 33e41416d5..6baca8c46e 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/rooted_arch.json +++ b/common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/rooted_arch.json @@ -7,7 +7,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 10 + "chance": 40 }, { "type": "minecraft:height_range", diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/habitats/deep_sea_spire.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/habitats/deep_sea_spire.json index 3b98c90a6f..aaa04ae8ff 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/habitats/deep_sea_spire.json +++ b/common/src/main/resources/data/cobblemon/worldgen/processor_list/habitats/deep_sea_spire.json @@ -13,7 +13,7 @@ "predicate_type": "minecraft:always_true" }, "output_state": { - "Name": "minecraft:air" + "Name": "minecraft:water" } } ] diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/natural_lightningrod.json b/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/natural_lightningrod.json index 3815830388..73605771af 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/natural_lightningrod.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/natural_lightningrod.json @@ -1,5 +1,5 @@ { - "biomes": "#minecraft:stony_peaks", + "biomes": "#cobblemon:is_mountain", "spawn_overrides": {}, "type": "minecraft:jigsaw", "start_pool": "cobblemon:habitats/natural_lightningrod_start", diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/sandpit_clearing.json b/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/sandpit_clearing.json index b442334248..e041498920 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/sandpit_clearing.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/habitats/sandpit_clearing.json @@ -1,5 +1,5 @@ { - "biomes": "#cobblemon:has_block/sand", + "biomes": "#cobblemon:is_grassland", "spawn_overrides": {}, "type": "minecraft:jigsaw", "start_pool": "cobblemon:habitats/sandpit_clearing_start", diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure_set/habitats/habitats.json b/common/src/main/resources/data/cobblemon/worldgen/structure_set/habitats/habitats.json index 4905deb05f..2993e08599 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure_set/habitats/habitats.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure_set/habitats/habitats.json @@ -1,8 +1,8 @@ { "placement": { "type": "minecraft:random_spread", - "spacing": 32, - "separation": 16, + "spacing": 30, + "separation": 14, "salt": 1892293476, "spread_type": "triangular" }, diff --git a/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/fae_mounds_connector.json b/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/fae_mounds_connector.json index cbcb2b2283..a11030a9ec 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/fae_mounds_connector.json +++ b/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/fae_mounds_connector.json @@ -73,7 +73,7 @@ } }, { - "weight": 14, + "weight": 10, "element": { "element_type": "minecraft:empty_pool_element" } diff --git a/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/sandpit_clearing_connector.json b/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/sandpit_clearing_connector.json index 6f4e6bd60f..c919c662f2 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/sandpit_clearing_connector.json +++ b/common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/sandpit_clearing_connector.json @@ -83,7 +83,7 @@ } }, { - "weight": 40, + "weight": 50, "element": { "element_type": "minecraft:empty_pool_element" }