Skip to content

Commit

Permalink
Merge pull request #112 from khonkhortisan/multi_rules
Browse files Browse the repository at this point in the history 
Multi rules
Merged for near-future textures to be merged cleanly.
  • Loading branch information
@khonkhortisan
khonkhortisan committed Aug 28, 2013
2 parents 96011bc + 885899c commit 913e355
Show file tree
Hide file tree
Showing 9 changed files with 408 additions and 96 deletions.
6 changes: 3 additions & 3 deletions mesecons/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ dofile(minetest.get_modpath("mesecons").."/legacy.lua");
function mesecon:receptor_on_i(pos, rules)
rules = rules or mesecon.rules.default

for _, rule in ipairs(rules) do
for _, rule in ipairs(mesecon:flattenrules(rules)) do
local np = mesecon:addPosRule(pos, rule)
local link, rulename = mesecon:rules_link(pos, np, rules)
if link then
Expand All @@ -125,11 +125,11 @@ end
function mesecon:receptor_off_i(pos, rules)
rules = rules or mesecon.rules.default

for _, rule in ipairs(rules) do
for _, rule in ipairs(mesecon:flattenrules(rules)) do
local np = mesecon:addPosRule(pos, rule)
local link, rulename = mesecon:rules_link(pos, np, rules)
if link then
if not mesecon:connected_to_receptor(np) then
if not mesecon:connected_to_receptor(np, mesecon:invertRule(rule)) then
mesecon:turnoff(np, rulename)
else
mesecon:changesignal(np, minetest.env:get_node(np), rulename, mesecon.state.off)
Expand Down
132 changes: 99 additions & 33 deletions mesecons/internal.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,18 +303,38 @@ end

-- Conductors

function mesecon:is_conductor_on(nodename)
function mesecon:is_conductor_on(nodename, rulename)
local conductor = mesecon:get_conductor(nodename)
if conductor and conductor.state == mesecon.state.on then
return true
if conductor then
if conductor.state then
return conductor.state == mesecon.state.on
end
if conductor.states then
if not rulename then
return mesecon:getstate(nodename, conductor.states) ~= 1
end
local bit = mesecon:rule2bit(rulename, mesecon:conductor_get_rules(minetest.registered_nodes[nodename]))
local binstate = mesecon:getbinstate(nodename, conductor.states)
return mesecon:get_bit(binstate, bit)
end
end
return false
end

function mesecon:is_conductor_off(nodename)
function mesecon:is_conductor_off(nodename, rulename)
local conductor = mesecon:get_conductor(nodename)
if conductor and conductor.state == mesecon.state.off then
return true
if conductor then
if conductor.state then
return conductor.state == mesecon.state.off
end
if conductor.states then
if not rulename then
return mesecon:getstate(nodename, conductor.states) == 1
end
local bit = mesecon:rule2bit(rulename, mesecon:conductor_get_rules(minetest.registered_nodes[nodename]))
local binstate = mesecon:getbinstate(nodename, conductor.states)
return not mesecon:get_bit(binstate, bit)
end
end
return false
end
Expand All @@ -327,20 +347,36 @@ function mesecon:is_conductor(nodename)
return false
end

function mesecon:get_conductor_on(offstate)
function mesecon:get_conductor_on(offstate, rulename)
local conductor = mesecon:get_conductor(offstate)
if conductor then
return conductor.onstate
if conductor.onstate then
return conductor.onstate
end
if conductor.states then
local bit = mesecon:rule2bit(rulename, mesecon:conductor_get_rules(minetest.registered_nodes[offstate]))
local binstate = mesecon:getbinstate(offstate, conductor.states)
binstate = mesecon:set_bit(binstate, bit, "1")
return conductor.states[tonumber(binstate,2)+1]
end
end
return false
return offstate
end

function mesecon:get_conductor_off(onstate)
function mesecon:get_conductor_off(onstate, rulename)
local conductor = mesecon:get_conductor(onstate)
if conductor then
return conductor.offstate
if conductor.offstate then
return conductor.offstate
end
if conductor.states then
local bit = mesecon:rule2bit(rulename, mesecon:conductor_get_rules(minetest.registered_nodes[onstate]))
local binstate = mesecon:getbinstate(onstate, conductor.states)
binstate = mesecon:set_bit(binstate, bit, "0")
return conductor.states[tonumber(binstate,2)+1]
end
end
return false
return onstate
end

function mesecon:conductor_get_rules(node)
Expand All @@ -358,17 +394,17 @@ end

-- some more general high-level stuff

function mesecon:is_power_on(pos)
function mesecon:is_power_on(pos, rulename)
local node = minetest.env:get_node(pos)
if mesecon:is_conductor_on(node.name) or mesecon:is_receptor_on(node.name) then
if mesecon:is_conductor_on(node.name, rulename) or mesecon:is_receptor_on(node.name) then
return true
end
return false
end

function mesecon:is_power_off(pos)
function mesecon:is_power_off(pos, rulename)
local node = minetest.env:get_node(pos)
if mesecon:is_conductor_off(node.name) or mesecon:is_receptor_off(node.name) then
if mesecon:is_conductor_off(node.name, rulename) or mesecon:is_receptor_off(node.name) then
return true
end
return false
Expand All @@ -377,11 +413,21 @@ end
function mesecon:turnon(pos, rulename)
local node = minetest.env:get_node(pos)

if mesecon:is_conductor_off(node.name) then
if mesecon:is_conductor_off(node.name, rulename) then
local rules = mesecon:conductor_get_rules(node)
minetest.env:add_node(pos, {name = mesecon:get_conductor_on(node.name), param2 = node.param2})

for _, rule in ipairs(rules) do
if not rulename then
for _, rule in ipairs(mesecon:flattenrules(rules)) do
if mesecon:connected_to_receptor(pos, rule) then
mesecon:turnon(pos, rule)
end
end
return
end

minetest.env:add_node(pos, {name = mesecon:get_conductor_on(node.name, rulename), param2 = node.param2})

for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
local np = mesecon:addPosRule(pos, rule)
local link, rulename = mesecon:rules_link(pos, np)

Expand All @@ -400,11 +446,21 @@ end
function mesecon:turnoff(pos, rulename)
local node = minetest.env:get_node(pos)

if mesecon:is_conductor_on(node.name) then
if mesecon:is_conductor_on(node.name, rulename) then
local rules = mesecon:conductor_get_rules(node)
minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name), param2 = node.param2})
--[[
if not rulename then
for _, rule in ipairs(mesecon:flattenrules(rules)) do
if mesecon:is_powered(pos, rule) then
mesecon:turnoff(pos, rule)
end
end
return
end
--]]
minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name, rulename), param2 = node.param2})

for _, rule in ipairs(rules) do
for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
local np = mesecon:addPosRule(pos, rule)
local link, rulename = mesecon:rules_link(pos, np)

Expand All @@ -422,17 +478,17 @@ function mesecon:turnoff(pos, rulename)
end


function mesecon:connected_to_receptor(pos)
function mesecon:connected_to_receptor(pos, rulename)
local node = minetest.env:get_node(pos)

-- Check if conductors around are connected
local rules = mesecon:get_any_inputrules(node)
if not rules then return false end

for _, rule in ipairs(rules) do
for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
local np = mesecon:addPosRule(pos, rule)
if mesecon:rules_link(np, pos) then
if mesecon:find_receptor_on(np, {}) then
if mesecon:find_receptor_on(np, {}, mesecon:invertRule(rule)) then
return true
end
end
Expand All @@ -441,7 +497,7 @@ function mesecon:connected_to_receptor(pos)
return false
end

function mesecon:find_receptor_on(pos, checked)
function mesecon:find_receptor_on(pos, checked, rulename)
-- find out if node has already been checked (to prevent from endless loop)
for _, cp in ipairs(checked) do
if mesecon:cmpPos(cp, pos) then
Expand All @@ -459,10 +515,10 @@ function mesecon:find_receptor_on(pos, checked)

if mesecon:is_conductor(node.name) then
local rules = mesecon:conductor_get_rules(node)
for _, rule in ipairs(rules) do
for _, rule in ipairs(mesecon:rule2meta(rulename, rules)) do
local np = mesecon:addPosRule(pos, rule)
if mesecon:rules_link(np, pos) then
if mesecon:find_receptor_on(np, checked) then
if mesecon:find_receptor_on(np, checked, mesecon:invertRule(rule)) then
return true
end
end
Expand All @@ -481,10 +537,10 @@ function mesecon:rules_link(output, input, dug_outputrules) --output/input are p
return
end

for _, outputrule in ipairs(outputrules) do
for _, outputrule in ipairs(mesecon:flattenrules(outputrules)) do
-- Check if output sends to input
if mesecon:cmpPos(mesecon:addPosRule(output, outputrule), input) then
for _, inputrule in ipairs(inputrules) do
for _, inputrule in ipairs(mesecon:flattenrules(inputrules)) do
-- Check if input accepts from output
if mesecon:cmpPos(mesecon:addPosRule(input, inputrule), output) then
return true, inputrule
Expand All @@ -499,16 +555,26 @@ function mesecon:rules_link_anydir(pos1, pos2)
return mesecon:rules_link(pos1, pos2) or mesecon:rules_link(pos2, pos1)
end

function mesecon:is_powered(pos)
function mesecon:is_powered(pos, rule)
local node = minetest.env:get_node(pos)
local rules = mesecon:get_any_inputrules(node)
if not rules then return false end

for _, rule in ipairs(rules) do
if not rule then
for _, rule in ipairs(mesecon:flattenrules(rules)) do
local np = mesecon:addPosRule(pos, rule)
local nn = minetest.env:get_node(np)

if (mesecon:is_conductor_on (nn.name, mesecon:invertRule(rule)) or mesecon:is_receptor_on (nn.name))
and mesecon:rules_link(np, pos) then
return true
end
end
else
local np = mesecon:addPosRule(pos, rule)
local nn = minetest.env:get_node(np)

if (mesecon:is_conductor_on (nn.name) or mesecon:is_receptor_on (nn.name))
if (mesecon:is_conductor_on (nn.name, mesecon:invertRule(rule)) or mesecon:is_receptor_on (nn.name))
and mesecon:rules_link(np, pos) then
return true
end
Expand Down
2 changes: 1 addition & 1 deletion mesecons/services.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mesecon.on_placenode = function (pos, node)
elseif mesecon:is_powered(pos) then
if mesecon:is_conductor(node.name) then
mesecon:turnon (pos)
mesecon:receptor_on (pos, mesecon:conductor_get_rules(node))
--mesecon:receptor_on (pos, mesecon:conductor_get_rules(node))

This comment has been minimized.

Sign in to view

Copy link
@Jeija

Jeija Mar 19, 2014

Collaborator

Why? This causes #146
else
mesecon:changesignal(pos, node, mesecon:effector_get_rules(node), "on")
mesecon:activate(pos, node)
Expand Down
Loading

0 comments on commit 913e355

Please sign in to comment.