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

This commit is contained in:
Thomas Rudin 2019-03-21 14:06:26 +01:00
commit dd8455a888
2 changed files with 10 additions and 3 deletions

View File

@ -43,6 +43,14 @@ end)
-- \___/\___/ -- \___/\___/
local function update_forcefield(pos, meta, active) local function update_forcefield(pos, meta, active)
if active then
-- rate limit by chance
if math.floor(math.random()*4) ~= 0 then
return
end
end
local shape = meta:get_int("shape") local shape = meta:get_int("shape")
local range = meta:get_int("range") local range = meta:get_int("range")
local vm = VoxelManip() local vm = VoxelManip()
@ -374,4 +382,3 @@ end
technic.register_machine("HV", "technic:forcefield_emitter_on", technic.receiver) technic.register_machine("HV", "technic:forcefield_emitter_on", technic.receiver)
technic.register_machine("HV", "technic:forcefield_emitter_off", technic.receiver) technic.register_machine("HV", "technic:forcefield_emitter_off", technic.receiver)

View File

@ -251,7 +251,7 @@ end
minetest.register_abm({ minetest.register_abm({
nodenames = {"technic:switching_station"}, nodenames = {"technic:switching_station"},
label = "Switching Station", -- allows the mtt profiler to profile this abm individually label = "Switching Station", -- allows the mtt profiler to profile this abm individually
interval = 1, interval = 1.1,
chance = 1, chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
if not technic.powerctrl_state then return end if not technic.powerctrl_state then return end
@ -524,7 +524,7 @@ end
minetest.register_abm({ minetest.register_abm({
label = "Machines: timeout check", label = "Machines: timeout check",
nodenames = {"group:technic_machine"}, nodenames = {"group:technic_machine"},
interval = 1, interval = 1.9,
chance = 3, chance = 3,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)