diff --git a/concrete.lua b/concrete.lua index f9af08c..ee18b18 100644 --- a/concrete.lua +++ b/concrete.lua @@ -74,11 +74,15 @@ minetest.register_node("bitumen:curing_concrete", { minetest.register_abm({ nodenames = {"bitumen:wet_concrete", "bitumen:wet_concrete_full", "bitumen:curing_concrete"}, - interval = 5, + interval = 2, chance = 5, + catch_up = true, action = function(pos) --- minetest.get_node_timer(pos):start(15*60) -- concrete takes half an hour to cure at best - minetest.get_node_timer(pos):start(5) -- fast cure for debugging + local t = minetest.get_node_timer(pos) + if not t:is_started() then + t:start(10*60) -- concrete takes twenty to cure at best + -- minetest.get_node_timer(pos):start(5) -- fast cure for debugging + end end }) diff --git a/crafts.lua b/crafts.lua index 20f7e8e..067adf9 100644 --- a/crafts.lua +++ b/crafts.lua @@ -146,7 +146,8 @@ minetest.register_craft( { "default:gravel", }, replacements = { - { "bucket:bucket_water", "bucket:bucket_empty" } + { "bucket:bucket_water", "bucket:bucket_empty" }, + { "bucket:bucket_water", "bucket:bucket_empty" }, } }) minetest.register_craft( { @@ -164,7 +165,8 @@ minetest.register_craft( { "default:gravel", }, replacements = { - { "bucket:bucket_water", "bucket:bucket_empty" } + { "bucket:bucket_river_water", "bucket:bucket_empty" }, + { "bucket:bucket_river_water", "bucket:bucket_empty" }, } }) minetest.register_craft( { @@ -182,7 +184,8 @@ minetest.register_craft( { "default:gravel", }, replacements = { - { "bucket:bucket_water", "bucket:bucket_empty" } + { "bucket:bucket_water", "bucket:bucket_empty" }, + { "bucket:bucket_river_water", "bucket:bucket_empty" }, } }) diff --git a/cylinder_tank.lua b/cylinder_tank.lua index 04500dd..ab0c3d1 100644 --- a/cylinder_tank.lua +++ b/cylinder_tank.lua @@ -11,7 +11,7 @@ local function check_tank_foundation(bpos) local d = math.ceil(height / 5) - return bitumen.check_foundation( + local ret = bitumen.check_foundation( {x = bpos.x - 2, y = bpos.y - 1 - d, z = bpos.z - 2}, {x = bpos.x + 2, y = bpos.y - 2 , z = bpos.z + 2}, { @@ -21,6 +21,25 @@ local function check_tank_foundation(bpos) ["bitumen:concrete"] = 1, } ) + + if ret == true then + return true + end + + -- try for the steel foundation + ret = bitumen.check_foundation( + {x = bpos.x - 1, y = bpos.y - 1 - d, z = bpos.z - 1}, + {x = bpos.x + 1, y = bpos.y - 1 , z = bpos.z + 1}, + { ["default:steelblock"] = 1 } + ) + + if not ret then + return false + end + -- todo: check steel legs + + + return true end diff --git a/fluids.lua b/fluids.lua index 92d9f50..e19815a 100644 --- a/fluids.lua +++ b/fluids.lua @@ -131,7 +131,7 @@ local function register_fluid(modname, name, info) - local soak = { + local default_soak = { ["default:cobble"] = 10, ["default:desert_cobble"] = 10, ["default:mossycobble"] = 9, @@ -190,8 +190,10 @@ local function register_fluid(modname, name, info) } local soak_names = {} + local soak = {} if info.no_default_soak ~= true then + soak = default_soak for n,_ in pairs(soak) do table.insert(soak_names, n) end diff --git a/init.lua b/init.lua index a4e405b..4b443ae 100644 --- a/init.lua +++ b/init.lua @@ -85,7 +85,7 @@ dofile(modpath.."/magic_nodes.lua") dofile(modpath.."/blueprints.lua") dofile(modpath.."/pipes.lua") dofile(modpath.."/burner.lua") -dofile(modpath.."/pipeline.lua") +--dofile(modpath.."/pipeline.lua") -- next core nodes dofile(modpath.."/fluids.lua")