Mirrorlandia_minetest/magma_conduits
1
0
Fork 0
mirror of https://github.com/minetest-mods/magma_conduits.git synced 2025-01-06 12:37:33 +01:00
Code Issues Projects Releases Wiki Activity

remove the lava cutoff setting, no longer needed now that veins are fixed

Browse Source
This commit is contained in:
FaceDeer 2018-12-25 18:20:49 -07:00
parent fe1e69dd48
commit f300d97686
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.lua
View File

@ -29,13 +29,12 @@ setting("bool", "cook_soil", true, "Cause soil and carbon-containing ores to be
setting("bool", "magma_veins", true, "Enable magma veins") setting("bool", "magma_veins", true, "Enable magma veins")
setting("int", "spread", 400, "Approximate spacing between magma conduits") setting("int", "spread", 400, "Approximate spacing between magma conduits")
setting("int", "remove_lava_above", 512, "Remove lava above this y level")
setting("bool", "obsidian_lining", true, "Add an obsidian lining to magma conduits") setting("bool", "obsidian_lining", true, "Add an obsidian lining to magma conduits")
setting("bool", "ameliorate_floods", true, "Ameliorate lava floods on the surface") setting("bool", "ameliorate_floods", true, "Ameliorate lava floods on the surface")
-- Removing this setting on account of issue https://github.com/minetest/minetest/issues/7364 -- Removing this setting on account of issue https://github.com/minetest/minetest/issues/7364
-- Fixed with commit https://github.com/minetest/minetest/commit/5c1edc58ab2abe8bc1f1bbcbb2f30a5899586968 -- Fixed with commit https://github.com/minetest/minetest/commit/5c1edc58ab2abe8bc1f1bbcbb2f30a5899586968
setting("int", "upper_limit", 31000, "Upper extent of magma conduits") setting("int", "upper_limit", -256, "Upper extent of magma conduits")
setting("int", "lower_limit", -31000, "Lower extent of magma conduits") setting("int", "lower_limit", -31000, "Lower extent of magma conduits")
setting("bool", "volcanoes", true, "Enable volcanoes") setting("bool", "volcanoes", true, "Enable volcanoes")

20
magma_veins.lua
View File

@ -47,9 +47,7 @@ minetest.register_ore({
local water_level = tonumber(minetest.get_mapgen_setting("water_level")) local water_level = tonumber(minetest.get_mapgen_setting("water_level"))
local lava_y_cutoff = magma_conduits.config.remove_lava_above local ameliorate_floods = magma_conduits.config.ameliorate_floods
-- if the y cutoff is at or below water level, ameliorate_floods is pointless.
local ameliorate_floods = magma_conduits.config.ameliorate_floods and lava_y_cutoff > water_level
local obsidian_lining = magma_conduits.config.obsidian_lining local obsidian_lining = magma_conduits.config.obsidian_lining
local c_air = minetest.get_content_id("air") local c_air = minetest.get_content_id("air")
@ -68,7 +66,7 @@ end
local remove_unsupported_lava local remove_unsupported_lava
remove_unsupported_lava = function(area, data, vi, x, y, z) remove_unsupported_lava = function(area, data, vi, x, y, z)
--if below water level, abort. Caverns are on their own. --if below water level, abort. Caverns are on their own.
if y < water_level or y > lava_y_cutoff or not area:contains(x, y, z) then return end if y < water_level or not area:contains(x, y, z) then return end
if data[vi] == c_lava then if data[vi] == c_lava then
if is_adjacent_to_air(area, data, x, y, z) then if is_adjacent_to_air(area, data, x, y, z) then
@ -109,15 +107,11 @@ minetest.register_on_generated(function(minp, maxp, seed)
vm:get_data(data) vm:get_data(data)
for vi, x, y, z in area:iterp_xyz(minp, maxp) do for vi, x, y, z in area:iterp_xyz(minp, maxp) do
if y > lava_y_cutoff and data[vi] == c_lava then if obsidian_lining then
data[vi] = c_air obsidianize(area, data, vi, x, y, z, minp, maxp)
else end
if obsidian_lining then if ameliorate_floods then
obsidianize(area, data, vi, x, y, z, minp, maxp) remove_unsupported_lava(area, data, vi, x, y, z)
end
if ameliorate_floods then
remove_unsupported_lava(area, data, vi, x, y, z)
end
end end
end end

4
settingtypes.txt
View File

@ -7,15 +7,13 @@ magma_conduits_remove_default_lava (Remove default mapgen lava) bool true
magma_conduits_magma_veins (Enable magma veins) bool true magma_conduits_magma_veins (Enable magma veins) bool true
magma_conduits_spread (Approximate spacing between magma conduits) int 400 magma_conduits_spread (Approximate spacing between magma conduits) int 400
magma_conduits_obsidian_lining (Add an obsidian lining to magma conduits) bool true magma_conduits_obsidian_lining (Add an obsidian lining to magma conduits) bool true
#This is useful for preventing magma conduits from being placed in floatlands
magma_conduits_remove_lava_above (Remove any lava above this y level) int 512
#Removes magma near the surface that could spill out of an open magma vein onto #Removes magma near the surface that could spill out of an open magma vein onto
#surrounding terrain #surrounding terrain
magma_conduits_ameliorate_floods (Ameliorate lava floods on the surface) bool true magma_conduits_ameliorate_floods (Ameliorate lava floods on the surface) bool true
# Note: Setting limits near "0" in versions of Minetest before June 2018 # Note: Setting limits near "0" in versions of Minetest before June 2018
# commit 5c1edc5 may cause a crash due to a bug in vein ore generation # commit 5c1edc5 may cause a crash due to a bug in vein ore generation
magma_conduits_upper_limit (Upper extent of magma conduits) int 31000 magma_conduits_upper_limit (Upper extent of magma conduits) int -256
magma_conduits_lower_limit (Lower extent of magma conduits) int -31000 magma_conduits_lower_limit (Lower extent of magma conduits) int -31000
[Volcanoes] [Volcanoes]