diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index 10eb5143a..5a75eab2f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -77,19 +77,19 @@ { "type": "tfg:wraptor", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", "maxCount": 3, - "minCount": 1, + "minCount": 2, "weight": 50 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 5, - "minCount": 1, + "minCount": 3, "weight": 100 }, { @@ -100,14 +100,14 @@ }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 5 }, { "type": "tfg:glacian_ram", "maxCount": 5, - "minCount": 1, + "minCount": 3, "weight": 100 }, { @@ -119,7 +119,7 @@ { "type": "species:goober", "maxCount": 2, - "minCount": 1, + "minCount": 2, "weight": 30 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 23e8dcc38..572b86fbc 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -82,32 +82,32 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 50 }, { "type": "tfg:wraptor", - "maxCount": 3, - "minCount": 2, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 1, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 20 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:glider", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { @@ -118,20 +118,20 @@ }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 20 }, { "type": "species:springling", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 50 }, { "type": "tfg:glacian_ram", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 40 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index ff13b90cf..bf51d52d3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -77,55 +77,55 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 3, - "minCount": 2, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "tfg:wraptor", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "species:goober", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 30 }, { "type": "wan_ancient_beasts:walker", "maxCount": 3, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 5, - "minCount": 3, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:glider", - "maxCount": 2, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 20 }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 5 }, { "type": "tfg:glacian_ram", "maxCount": 5, - "minCount": 3, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 10 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 68130138f..3e4dfd8df 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -97,38 +97,38 @@ "creature": [ { "type": "tfg:wraptor", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 20 }, { "type": "species:springling", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 10 }, { "type": "wan_ancient_beasts:glider", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 10 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index f5c4782cd..164a8e3f1 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -50,6 +50,7 @@ "#tfg:mars_top_layer_modification" ], "has_precipitation": false, + "creature_spawn_probability": 0.25, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { "energy_budget": 0.05, @@ -82,49 +83,49 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 50 }, { "type": "tfg:wraptor", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 50 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 20 }, { "type": "wan_ancient_beasts:glider", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 10 }, { "type": "species:goober", - "maxCount": 2, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 1, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 20 }, { "type": "tfg:glacian_ram", - "maxCount": 2, - "minCount": 1, + "maxCount": 5, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 20 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 8d667d74e..6bdf44f33 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -77,19 +77,19 @@ { "type": "tfg:wraptor", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", "maxCount": 3, - "minCount": 1, + "minCount": 2, "weight": 50 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 5, - "minCount": 1, + "minCount": 3, "weight": 100 }, { @@ -100,14 +100,14 @@ }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 5 }, { "type": "tfg:glacian_ram", "maxCount": 5, - "minCount": 1, + "minCount": 3, "weight": 100 }, { @@ -119,7 +119,7 @@ { "type": "species:goober", "maxCount": 2, - "minCount": 1, + "minCount": 2, "weight": 30 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 86e6eac23..33fa1aa35 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -82,20 +82,20 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 3, - "minCount": 2, - "weight": 10 + "maxCount": 4, + "minCount": 3, + "weight": 50 }, { "type": "tfg:wraptor", - "maxCount": 3, - "minCount": 2, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 1, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 20 }, { @@ -106,33 +106,33 @@ }, { "type": "wan_ancient_beasts:glider", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, - "weight": 30 + "weight": 60 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 20 }, { "type": "species:springling", - "maxCount": 3, - "minCount": 1, - "weight": 100 + "maxCount": 4, + "minCount": 3, + "weight": 50 }, { "type": "tfg:glacian_ram", - "maxCount": 3, - "minCount": 1, - "weight": 20 + "maxCount": 4, + "minCount": 3, + "weight": 40 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 91c878595..d77a5ac3f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -77,55 +77,55 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 3, - "minCount": 2, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "tfg:wraptor", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "species:goober", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 30 }, { "type": "wan_ancient_beasts:walker", "maxCount": 3, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 5, - "minCount": 3, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:glider", - "maxCount": 2, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 20 }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 5 }, { "type": "tfg:glacian_ram", "maxCount": 5, - "minCount": 3, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 10 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index c080ab50b..dec04a813 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -77,19 +77,19 @@ { "type": "tfg:wraptor", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", "maxCount": 3, - "minCount": 1, + "minCount": 2, "weight": 50 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 5, - "minCount": 1, + "minCount": 3, "weight": 100 }, { @@ -100,14 +100,14 @@ }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 5 }, { "type": "tfg:glacian_ram", "maxCount": 5, - "minCount": 1, + "minCount": 3, "weight": 100 }, { @@ -119,7 +119,7 @@ { "type": "species:goober", "maxCount": 2, - "minCount": 1, + "minCount": 2, "weight": 30 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 02fc05e82..d667dd80c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -82,57 +82,57 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 3, - "minCount": 1, - "weight": 20 + "maxCount": 4, + "minCount": 3, + "weight": 50 }, { "type": "tfg:wraptor", - "maxCount": 3, - "minCount": 2, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 1, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 20 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 3, - "minCount": 1, - "weight": 70 + "maxCount": 4, + "minCount": 2, + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 4, - "minCount": 1, + "minCount": 3, "weight": 100 }, { "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, - "weight": 100 + "weight": 60 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 20 }, { "type": "species:springling", - "maxCount": 3, - "minCount": 1, - "weight": 80 + "maxCount": 4, + "minCount": 3, + "weight": 50 }, { "type": "tfg:glacian_ram", - "maxCount": 3, - "minCount": 1, - "weight": 30 + "maxCount": 4, + "minCount": 3, + "weight": 40 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 1bd8e7a6f..d6d14cbdc 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -77,55 +77,55 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 3, - "minCount": 2, + "maxCount": 4, + "minCount": 3, "weight": 100 }, { "type": "tfg:wraptor", "maxCount": 4, - "minCount": 2, + "minCount": 3, "weight": 100 }, { "type": "species:goober", - "maxCount": 2, - "minCount": 1, + "maxCount": 3, + "minCount": 2, "weight": 30 }, { "type": "wan_ancient_beasts:walker", "maxCount": 3, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 5, - "minCount": 3, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:glider", - "maxCount": 2, - "minCount": 1, + "maxCount": 4, + "minCount": 3, "weight": 20 }, { "type": "wan_ancient_beasts:soarer", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 5 }, { "type": "tfg:glacian_ram", "maxCount": 5, - "minCount": 3, + "minCount": 4, "weight": 100 }, { "type": "wan_ancient_beasts:eater", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 10 } diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 0a249aca0..f48058a84 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -256,6 +256,8 @@ const registerAdAstraBlockTags = (event) => { event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_red_granite') event.add('ad_astra:mars_stone_replaceables', 'minecraft:dripstone_block') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_dripstone') + event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/gravel_venus') + event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/gravel_mars') event.add('tfg:mars_soil', 'minecraft:red_sand') event.add('tfg:mars_soil', 'ad_astra:mars_sand') event.add('tfg:mars_soil', 'ad_astra:venus_sand')