Merge branch 'pandorabox' of github.com:pandorabox-io/technic into pandorabox

This commit is contained in:
Thomas Rudin 2018-12-22 17:40:00 +01:00
commit 30b38e08dd
2 changed files with 8 additions and 8 deletions

View File

@ -32,7 +32,7 @@ minetest.register_globalstep(function(dtime)
quota_map = {} quota_map = {}
-- this many blocks per second -- this many blocks per second
local init_quota = minetest.settings:get("technic.quarry.quota") or 4 local init_quota = minetest.settings:get("technic.quarry.quota") or 10
local players = minetest.get_connected_players() local players = minetest.get_connected_players()
for i, player in pairs(players) do for i, player in pairs(players) do
@ -149,16 +149,15 @@ local function quarry_run(pos, node)
local digging_allowed = false local digging_allowed = false
local quota = quota_map[owner] local quota = quota_map[owner]
if quota and quota > 0 then digging_allowed = quota and quota > 0
-- decrement quota
quota = quota - 1
quota_map[owner] = quota
digging_allowed = true
end
if digging_allowed and meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then if digging_allowed and meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then
-- decrement quota
quota = quota - 1
quota_map[owner] = quota
local pdir = minetest.facedir_to_dir(node.param2) local pdir = minetest.facedir_to_dir(node.param2)
if pdir.y ~= 0 then if pdir.y ~= 0 then
-- faces up or down, not valid, otherwise depth-check would run endless and hang up the server -- faces up or down, not valid, otherwise depth-check would run endless and hang up the server

View File

@ -28,6 +28,7 @@ local recipes = {
-- The highest volume use of carbon black is as a reinforcing filler in rubber products, especially tires. -- The highest volume use of carbon black is as a reinforcing filler in rubber products, especially tires.
-- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …" -- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …"
{"technic:raw_latex 4", "technic:coal_dust 2", "technic:rubber 6", 2}, {"technic:raw_latex 4", "technic:coal_dust 2", "technic:rubber 6", 2},
{"default:ice", "bucket:bucket_empty", "bucket:bucket_water", 1 },
} }
if minetest.get_modpath("ethereal") then if minetest.get_modpath("ethereal") then