diff --git a/burner.lua b/burner.lua index f20596c..76c58f6 100644 --- a/burner.lua +++ b/burner.lua @@ -51,7 +51,9 @@ bitumen.get_melter_active_formspec = function(fuel_percent, item_percent) end -bitumen.register_burner = function(nodes, callbacks) +bitumen.register_burner = function(nodes, callbacks, burnfactor) + local bf = burnfactor or 1.0 + local default_callbacks = { grab_fuel = grab_fuel, -- needs to return the fuel time start_cook = function() end, -- needs to return the cook time @@ -66,6 +68,11 @@ bitumen.register_burner = function(nodes, callbacks) default_callbacks[k] = v end + local gf = default_callbacks.grab_fuel + default_callbacks.grab_fuel = function(inv) + return gf(inv) * bf + end + for _,n in ipairs(nodes) do print("setting burner: "..n) bitumen.burners[n] = default_callbacks diff --git a/crafts.lua b/crafts.lua index 782d28d..cbc8ae8 100644 --- a/crafts.lua +++ b/crafts.lua @@ -187,7 +187,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "bitumen:oil_drum 18", + output = "bitumen:oil_drum 27", recipe = { {"default:steelblock", "default:tin_ingot", "default:steelblock"}, {"default:steelblock", "", "default:steelblock"}, diff --git a/fluids.lua b/fluids.lua index 889f7c8..bd8fc31 100644 --- a/fluids.lua +++ b/fluids.lua @@ -458,10 +458,10 @@ register_fluid("bitumen", "crude_oil", { desc = "Crude Oil", groups = {flammable=1, petroleum=1}, - reflow_interval = 10, + reflow_interval = 5, reflow_chance = 2, - flow_interval = 3, - flow_chance = 3, + flow_interval = 2, + flow_chance = 1, colorize = "^[colorize:black:240", post_effect_color = {a = 103, r = 80, g = 76, b = 90}, diff --git a/pipes.lua b/pipes.lua index a9faa2e..ff52be8 100644 --- a/pipes.lua +++ b/pipes.lua @@ -446,7 +446,7 @@ minetest.register_node("bitumen:intake", { connect_right = {{ .1, -.1, -.1, .5, .1, .1}}, connect_bottom = {{ -.1, -.5, -.1, .1, .1, .1}}, }, - connects_to = { "group:petroleum_pipe", "group:petroleum_fixture"}, + connects_to = { "group:petroleum_pipe"--[[, "group:petroleum_fixture"]]}, paramtype = "light", is_ground_content = false, tiles = { "default_tin_block.png" }, @@ -549,7 +549,7 @@ minetest.register_node("bitumen:spout", { connect_right = {{ .1, -.1, -.1, .5, .1, .1}}, connect_top = {{ -.1, -.1, -.1, .1, .5, .1}}, }, - connects_to = { "group:petroleum_pipe", "group:petroleum_fixture" }, + connects_to = { "group:petroleum_pipe",--[[ "group:petroleum_fixture" ]]}, paramtype = "light", is_ground_content = false, tiles = { "default_copper_block.png" }, diff --git a/pump.lua b/pump.lua index 49c3d90..f102c3b 100644 --- a/pump.lua +++ b/pump.lua @@ -159,13 +159,13 @@ minetest.register_abm({ -- HACK: hardcoded buffer amount local to_take = math.min(20, 64 - backnet.buffer) if to_take == 0 then - print("pump: output pipe full") + -- print("pump: output pipe full") return end local taken, fluid = bitumen.pipes.take_fluid(frontpos, to_take) local pushed = bitumen.pipes.push_fluid(backpos, fluid, taken, lift) - print("bitumen pumped " ..taken .. " > "..pushed) + -- print("bitumen pumped " ..taken .. " > "..pushed) if pushed < taken then print("bitumen pump leaked ".. (taken - pushed)) diff --git a/refinery.lua b/refinery.lua index 791f0d2..7916883 100644 --- a/refinery.lua +++ b/refinery.lua @@ -180,7 +180,7 @@ bitumen.register_burner({"bitumen:distillation_column_boiler_on"}, { end end, get_formspec_on = get_melter_active_formspec, -}) +}, 5.0) minetest.register_node("bitumen:distillation_column_boiler", { description = "Distillation Column Boiler", diff --git a/wells.lua b/wells.lua index 078bbff..3ade84d 100644 --- a/wells.lua +++ b/wells.lua @@ -798,7 +798,7 @@ minetest.register_abm({ -- local expos = alts.mud_extractor -- expos.x = expos.x + 1 - local p = bitumen.pipes.push_fluid(expos, "bitumen:crude_oil", 5, 20) + local p = bitumen.pipes.push_fluid(expos, "bitumen:crude_oil", 15, 20) --print("pushed " .. p) end