diff --git a/mods/MAPGEN/pyutest_mapgen/mapgen.lua b/mods/MAPGEN/pyutest_mapgen/mapgen.lua index 6a2a754..d6b08d8 100644 --- a/mods/MAPGEN/pyutest_mapgen/mapgen.lua +++ b/mods/MAPGEN/pyutest_mapgen/mapgen.lua @@ -135,7 +135,7 @@ PyuTest.register_overworld_biome = function(name, type, opts) humidity_point = nopts["humidity_point"], y_max = 0, - y_min = PyuTest.OCEAN_MIN + y_min = PyuTest.OVERWORLD_OCEAN_MIN }, { _pyutest_biome_type = PyuTest.BIOME_TYPES.OCEAN, _pyutest_ocean_type = type @@ -156,8 +156,8 @@ PyuTest.register_overworld_biome = function(name, type, opts) heat_point = nopts["heat_point"], humidity_point = nopts["humidity_point"], - y_max = PyuTest.DEEP_OCEAN_MAX, - y_min = PyuTest.DEEP_OCEAN_MIN, + y_max = PyuTest.OVERWORLD_DEEP_OCEAN_MAX, + y_min = PyuTest.OVERWORLD_DEEP_OCEAN_MIN, vertical_blend = 5 }, { _pyutest_biome_type = PyuTest.BIOME_TYPES.OCEAN, @@ -168,7 +168,7 @@ PyuTest.register_overworld_biome = function(name, type, opts) name = name.."_cave", heat_point = nopts["heat_point"], humidity_point = nopts["humidity_point"], - y_max = PyuTest.DEEP_OCEAN_MIN - 1, + y_max = PyuTest.OVERWORLD_DEEP_OCEAN_MIN - 1, y_min = PyuTest.OVERWORLD_BOTTOM, }, { _pyutest_biome_type = PyuTest.BIOME_TYPES.CAVE, @@ -182,7 +182,7 @@ if PyuTest.is_flat() then node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.grassland, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 50, humidity_point = 50, @@ -196,7 +196,7 @@ PyuTest.register_overworld_biome("grassland", PyuTest.BIOME_TYPES.NORMAL, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.grassland, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 53, humidity_point = 57, @@ -209,7 +209,7 @@ PyuTest.register_overworld_biome("forest", PyuTest.BIOME_TYPES.NORMAL, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 50, humidity_point = 65, @@ -233,7 +233,7 @@ PyuTest.register_overworld_biome("desert", PyuTest.BIOME_TYPES.DESERT, { node_riverbed = "pyutest_blocks:sand_block", y_max = PyuTest.BIOME_TOPS.desert, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 84, humidity_point = 4 @@ -268,7 +268,7 @@ PyuTest.register_overworld_biome("frozen_plains", PyuTest.BIOME_TYPES.COLD, { node_filler = "pyutest_blocks:snow_block", y_max = PyuTest.BIOME_TOPS.frozen_plains, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, node_water_top = "pyutest_blocks:ice_block", depth_water_top = 5, @@ -282,7 +282,7 @@ PyuTest.register_overworld_biome("mushroom_fields", PyuTest.BIOME_TYPES.NORMAL, node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.mushroom_fields, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 53, humidity_point = 94 @@ -293,7 +293,7 @@ PyuTest.register_overworld_biome("ice_spikes", PyuTest.BIOME_TYPES.COLD, { node_filler = "pyutest_blocks:ice_block", y_max = PyuTest.BIOME_TOPS.ice_spikes, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, node_water_top = "pyutest_blocks:ice_block", depth_water_top = 5, @@ -308,7 +308,7 @@ PyuTest.register_overworld_biome("meadow", PyuTest.BIOME_TYPES.NORMAL, { depth_filler = 4, y_max = PyuTest.BIOME_TOPS.mountains, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 52, humidity_point = 83, @@ -323,7 +323,7 @@ PyuTest.register_overworld_biome("snowy_forest", PyuTest.BIOME_TYPES.COLD, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, node_water_top = "pyutest_blocks:ice_block", depth_water_top = 5, @@ -337,7 +337,7 @@ PyuTest.register_overworld_biome("savanna", PyuTest.BIOME_TYPES.WARM, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.grassland, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 72, humidity_point = 9 @@ -348,7 +348,7 @@ PyuTest.register_overworld_biome("taiga", PyuTest.BIOME_TYPES.CHILLY, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 28, humidity_point = 72, @@ -361,7 +361,7 @@ PyuTest.register_overworld_biome("birch_forest", PyuTest.BIOME_TYPES.NORMAL, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 48, humidity_point = 85, @@ -374,7 +374,7 @@ PyuTest.register_overworld_biome("cherry_grove", PyuTest.BIOME_TYPES.NORMAL, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 52, humidity_point = 78, @@ -388,7 +388,7 @@ PyuTest.register_overworld_biome("swamp", PyuTest.BIOME_TYPES.WETLAND, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.swamp, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 52, humidity_point = 88, @@ -399,7 +399,7 @@ PyuTest.register_overworld_biome("old_growth_birch_forest", PyuTest.BIOME_TYPES. node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 47, humidity_point = 73, @@ -413,7 +413,7 @@ PyuTest.register_overworld_biome("aspen_forest", PyuTest.BIOME_TYPES.CHILLY, { node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 25, humidity_point = 63, @@ -426,7 +426,7 @@ PyuTest.register_overworld_biome("redwood_forest", PyuTest.BIOME_TYPES.CHILLY, { node_filler = "pyutest_blocks:podzol_block", y_max = PyuTest.BIOME_TOPS.forest, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 21, humidity_point = 65, @@ -439,7 +439,7 @@ PyuTest.register_overworld_biome("large_mushroom_forest", PyuTest.BIOME_TYPES.NO node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.mushroom_fields, - y_min = PyuTest.SURFACE_BOTTOM, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 53, humidity_point = 98 diff --git a/mods/MAPGEN/pyutest_mapgen/structures.lua b/mods/MAPGEN/pyutest_mapgen/structures.lua index 263ad70..18cda26 100644 --- a/mods/MAPGEN/pyutest_mapgen/structures.lua +++ b/mods/MAPGEN/pyutest_mapgen/structures.lua @@ -42,7 +42,7 @@ PyuTest.register_structure("ocean_ruins", "OceanRuins", { fill_ratio = 0.0002, place_on = {"pyutest_blocks:gravel_block"}, biomes = PyuTest.get_biomes_from_type(PyuTest.BIOME_TYPES.OCEAN), - y_max = PyuTest.DEEP_OCEAN_MAX + 4, + y_max = PyuTest.OVERWORLD_DEEP_OCEAN_MAX + 4, y_min = PyuTest.DEAP_OCEAN_MIN, spawn_by = {"pyutest_blocks:water_source"}, num_spawn_by = 2 diff --git a/mods/MAPGEN/pyutest_mapgen/trees.lua b/mods/MAPGEN/pyutest_mapgen/trees.lua index a8ea135..ca6c1e6 100644 --- a/mods/MAPGEN/pyutest_mapgen/trees.lua +++ b/mods/MAPGEN/pyutest_mapgen/trees.lua @@ -62,7 +62,7 @@ minetest.register_decoration({ fill_ratio = 0.04, place_on = {"group:sugarcane_spawn_on"}, decoration = "pyutest_blocks:sugarcane", - y_max = PyuTest.SURFACE_BOTTOM, + y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM, y_min = 0, spawn_by = {"pyutest_blocks:water_source"}, num_spawn_by = 1, diff --git a/mods/MAPGEN/pyutest_worlds/api.lua b/mods/MAPGEN/pyutest_worlds/api.lua index 7475d88..ae27e7b 100644 --- a/mods/MAPGEN/pyutest_worlds/api.lua +++ b/mods/MAPGEN/pyutest_worlds/api.lua @@ -80,26 +80,24 @@ PyuTest.register_world = function (options) -- Spent hours trying to get this to work using mapblocks, just resorted to waiting a second. minetest.after(1.2, function () - local upos = user:get_pos() - - PyuTest.dorange(upos, range, function (p) + PyuTest.dorange(npos, range, function (p) minetest.remove_node(p) end) for dx = -range, range do for dz = -range, range do - minetest.set_node(upos + vector.new(dx, -2, dz), { + minetest.set_node(npos + vector.new(dx, -2, dz), { name = "pyutest_blocks:obsidian_block" }) end end - minetest.set_node(upos + vector.new(0, -1, 0), { + minetest.set_node(npos + vector.new(0, -1, 0), { name = "pyutest_blocks:light" }) - user:set_pos(upos) + user:set_pos(npos) end) end }) diff --git a/mods/MAPGEN/pyutest_worlds/lava.lua b/mods/MAPGEN/pyutest_worlds/lava.lua index 8ebe25f..14c57fd 100644 --- a/mods/MAPGEN/pyutest_worlds/lava.lua +++ b/mods/MAPGEN/pyutest_worlds/lava.lua @@ -23,12 +23,34 @@ PyuTest.LavaWorld:register_ore({ noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS }) -PyuTest.LavaWorld:register_decoration({ - deco_type = "simple", - sidelen = 16, - fill_ratio = 0.00063, - decoration = {"pyutest_blocks:lava_source"}, - place_on = {"pyutest_blocks:molten_rock_block", "pyutest_blocks:magma"}, +PyuTest.LavaWorld:register_ore({ + ore_type = "blob", + ore = "pyutest_blocks:lava_source", + wherein = "pyutest_blocks:molten_rock_block", + clust_scarcity = 7.5 * 7.5 * 7.5, + clust_num_ores = 1, + clust_size = 2, biomes = {lava_cavern}, - flags = "all_ceilings" + noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS }) + +PyuTest.LavaWorld:register_ore({ + ore_type = "blob", + ore = "pyutest_blocks:lava_source", + wherein = "pyutest_blocks:molten_rock_block", + clust_scarcity = 14.5 * 14.5 * 14.5, + clust_num_ores = 4, + clust_size = 6, + biomes = {lava_cavern}, + noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS +}) + +-- PyuTest.LavaWorld:register_decoration({ +-- deco_type = "simple", +-- sidelen = 16, +-- fill_ratio = 0.00063, +-- decoration = {"pyutest_blocks:lava_source"}, +-- place_on = {"pyutest_blocks:molten_rock_block", "pyutest_blocks:magma"}, +-- biomes = {lava_cavern}, +-- flags = "all_ceilings" +-- })