From f6c475a5e70e8034e86bb6d1ac309bede95fefe2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 30 Aug 2025 20:06:13 +0100 Subject: [PATCH] added venus sand, messing around with surfer spawning again... --- .../tfg/worldgen/biome/mars/amber_edge.json | 34 +++++++++++++++--- .../tfg/worldgen/biome/mars/amber_hills.json | 9 ++++- .../tfg/worldgen/biome/mars/amber_plains.json | 3 +- .../biome/mars/martian_mountains.json | 27 ++++++++++++-- .../worldgen/biome/mars/martian_river.json | 36 +++++++++++++++++++ .../worldgen/biome/mars/rusticus_edge.json | 5 +-- .../worldgen/biome/mars/rusticus_hills.json | 9 ++++- .../worldgen/biome/mars/rusticus_plains.json | 3 +- .../tfg/worldgen/biome/mars/sangnum_edge.json | 14 ++++++-- .../worldgen/biome/mars/sangnum_hills.json | 9 ++++- .../worldgen/biome/mars/sangnum_plains.json | 3 +- .../mars/terrain/venus_sand_disc.json | 26 ++++++++++++++ .../mars/terrain/peat_disc.json | 2 +- .../mars/terrain/venus_sand_disc.json | 26 ++++++++++++++ 14 files changed, 187 insertions(+), 19 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/terrain/venus_sand_disc.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/terrain/venus_sand_disc.json diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index a97703003..cad698282 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -35,7 +35,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc" + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", @@ -71,14 +72,26 @@ "axolotls": [], "creature": [ { - "type": "tfg:wraptor", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { - "type": "wan_ancient_beasts:crusher", + "type": "tfg:wraptor", "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 3, + "minCount": 1, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, "minCount": 1, "weight": 100 }, @@ -94,6 +107,12 @@ "minCount": 1, "weight": 5 }, + { + "type": "tfg:glacian_ram", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, { "type": "wan_ancient_beasts:eater", "maxCount": 1, @@ -136,7 +155,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 501d79dd8..560c05930 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -40,7 +40,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/kaolin_clay_disc" + "tfg:mars/terrain/kaolin_clay_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", @@ -90,6 +91,12 @@ "minCount": 2, "weight": 100 }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, { "type": "wan_ancient_beasts:crusher", "maxCount": 3, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 16a0fc71b..e66a1c85b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -38,7 +38,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc" + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index da5bdfbd1..c3a4d8b02 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -41,7 +41,9 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/venus_sand_disc" + ], [ "tfc:raw_boulder", "tfc:raw_boulder_small_patch", @@ -87,7 +89,7 @@ "type": "tfg:wraptor", "maxCount": 2, "minCount": 1, - "weight": 50 + "weight": 20 }, { "type": "species:springling", @@ -112,6 +114,12 @@ "maxCount": 2, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 10 } ], "misc": [], @@ -143,7 +151,20 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:toxlacanth", + "maxCount": 5, + "minCount": 2, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 13cf0ecc0..96a146b81 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -69,17 +69,53 @@ "ambient": [], "axolotls": [], "creature": [ + { + "type": "tfg:sniffer", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, { "type": "tfg:wraptor", "maxCount": 2, "minCount": 1, "weight": 50 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 10 + }, { "type": "species:goober", "maxCount": 2, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 2, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 10 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 0f4f43e83..318f783ad 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -35,7 +35,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc" + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", @@ -86,7 +87,7 @@ "type": "wan_ancient_beasts:walker", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "wan_ancient_beasts:crusher", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 547caa1d3..08385c878 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -40,7 +40,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/kaolin_clay_disc" + "tfg:mars/terrain/kaolin_clay_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", @@ -90,6 +91,12 @@ "minCount": 2, "weight": 100 }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, { "type": "wan_ancient_beasts:crusher", "maxCount": 4, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 120c6f932..ce24c3480 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -38,7 +38,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc" + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 4d4f891ff..abcf4f18f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -35,7 +35,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc" + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", @@ -86,7 +87,7 @@ "type": "wan_ancient_beasts:walker", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "wan_ancient_beasts:crusher", @@ -154,7 +155,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 962387942..b710af2fe 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -40,7 +40,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/kaolin_clay_disc" + "tfg:mars/terrain/kaolin_clay_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", @@ -90,6 +91,12 @@ "minCount": 2, "weight": 100 }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, { "type": "wan_ancient_beasts:crusher", "maxCount": 3, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index ac7eb2309..7270976c9 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -38,7 +38,8 @@ "#tfg:mars_veins", [ "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc" + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [ "tfg:mars_forest", diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/venus_sand_disc.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/venus_sand_disc.json new file mode 100644 index 000000000..32c09de38 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/venus_sand_disc.json @@ -0,0 +1,26 @@ +{ + "type": "tfc:soil_disc", + "config": { + "min_radius": 4, + "max_radius": 7, + "height": 2, + "states": [ + { + "replace": "tfg:grass/mars_dirt", + "with": "ad_astra:venus_sand" + }, + { + "replace": "tfg:grass/amber_mycelium", + "with": "ad_astra:venus_sand" + }, + { + "replace": "tfg:grass/rusticus_mycelium", + "with": "ad_astra:venus_sand" + }, + { + "replace": "tfg:grass/sangnum_mycelium", + "with": "ad_astra:venus_sand" + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json index f442e599a..e04ac5994 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json @@ -17,7 +17,7 @@ }, { "type": "tfc:climate", - "min_forest": "sparse" + "min_forest": "edge" } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/venus_sand_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/venus_sand_disc.json new file mode 100644 index 000000000..59ca053e5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/venus_sand_disc.json @@ -0,0 +1,26 @@ +{ + "feature": "tfg:mars/terrain/venus_sand_disc", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "tfc:near_fluid", + "fluids": [ + "tfg:semiheavy_ammoniacal_water" + ], + "radius": 4 + } + ] +} \ No newline at end of file