diff --git a/CHANGELOG.md b/CHANGELOG.md index 807c534..11a6ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ Other Game Changes: - Various biomes now use normal grass - Added Mossy Cobblestone - Added Boulders +- Mushroom biomes are now marked as lowlands, only going up to Y 10 Code Changes: diff --git a/minetest.conf b/minetest.conf index 61f5cdd..e39028b 100644 --- a/minetest.conf +++ b/minetest.conf @@ -1,3 +1,10 @@ +# Nodelands options +always_day = false +fire_spreads = true +acid_spreads = true +explosion_damage = true + +# other options unified_inventory_lite = false unified_inventory_bags = false unified_inventory_waypoints = false diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index 1b4d9c4..45e0c78 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -1,18 +1,3 @@ -if PyuTest.is_flat() then - PyuTest.register_overworld_biome("flat", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_grass:grass_block", - node_filler = "pyutest_blocks:dirt_block", - - y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, - y_min = PyuTest.OVERWORLD_BOTTOM, - - heat_point = 50, - humidity_point = 50, - }) - - return -end - -- "Just right" PyuTest.register_overworld_biome("Plains", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_grass:grass_block", @@ -147,7 +132,7 @@ PyuTest.register_overworld_biome("MushroomFields", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_blocks:mycelium_block", node_filler = "pyutest_blocks:dirt_block", - y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, + y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 30, @@ -163,7 +148,7 @@ PyuTest.register_overworld_biome("LargeMushroomForest", PyuTest.BIOME_TYPES.NORM node_top = "pyutest_blocks:mycelium_block", node_filler = "pyutest_blocks:dirt_block", - y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, + y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 30, @@ -252,7 +237,7 @@ PyuTest.register_overworld_biome("RedwoodForest", PyuTest.BIOME_TYPES.CHILLY, { _pyutest_fog_distance = 60, }) --- STUPID COLD, CANADA LEVELS OF COLD +-- Winter PyuTest.register_overworld_biome("FrozenPlains", PyuTest.BIOME_TYPES.COLD, { node_dust = "pyutest_blocks:snow_carpet", node_top = "pyutest_blocks:snow_block", @@ -305,7 +290,24 @@ PyuTest.register_overworld_biome("IceSpikes", PyuTest.BIOME_TYPES.COLD, { _enable_beaches = false }) --- Peaks and mountains regardless of temperature +-- Mountains +PyuTest.register_overworld_biome("StonyPeaks", PyuTest.BIOME_TYPES.CHILLY, { + depth_top = 0, + depth_filler = 0, + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, + + heat_point = 20, + humidity_point = 30, + + vertical_blend = 8, + + weight = PyuTest.BIOME_WEIGHTS.large, + + _enable_beaches = false +}) + PyuTest.register_overworld_biome("FrozenPeaks", PyuTest.BIOME_TYPES.COLD, { node_top = "pyutest_blocks:snow_block", node_filler = "pyutest_blocks:ice_block", @@ -341,23 +343,6 @@ PyuTest.register_overworld_biome("JaggedPeaks", PyuTest.BIOME_TYPES.COLD, { _enable_beaches = false }) -PyuTest.register_overworld_biome("StonyPeaks", PyuTest.BIOME_TYPES.CHILLY, { - depth_top = 0, - depth_filler = 0, - - y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, - y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, - - heat_point = 20, - humidity_point = 30, - - vertical_blend = 8, - - weight = PyuTest.BIOME_WEIGHTS.large, - - _enable_beaches = false -}) - PyuTest.register_overworld_biome("Grove", PyuTest.BIOME_TYPES.COLD, { node_top = "pyutest_blocks:snow_block", node_filler = "pyutest_blocks:dirt_block", diff --git a/mods/WORLD/pyutest_overworld/init.lua b/mods/WORLD/pyutest_overworld/init.lua index 2c43dfa..80a153f 100644 --- a/mods/WORLD/pyutest_overworld/init.lua +++ b/mods/WORLD/pyutest_overworld/init.lua @@ -1,11 +1,23 @@ local modpath = core.get_modpath("pyutest_overworld") -dofile(modpath .. "/biomes.lua") +if PyuTest.is_flat() then + PyuTest.register_overworld_biome("flat", PyuTest.BIOME_TYPES.NORMAL, { + node_top = "pyutest_grass:grass_block", + node_filler = "pyutest_blocks:dirt_block", -if not PyuTest.is_flat() then - dofile(modpath .. "/caves.lua") - dofile(modpath .. "/features.lua") - dofile(modpath .. "/structures.lua") - dofile(modpath .. "/trees.lua") - dofile(modpath .. "/flowers.lua") + y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, + y_min = PyuTest.OVERWORLD_BOTTOM, + + heat_point = 50, + humidity_point = 50, + }) + + return end + +dofile(modpath .. "/biomes.lua") +dofile(modpath .. "/caves.lua") +dofile(modpath .. "/features.lua") +dofile(modpath .. "/structures.lua") +dofile(modpath .. "/trees.lua") +dofile(modpath .. "/flowers.lua")