Re-write pistons from scratch, propably fixes a lot of bugs and doesn't cause too many new ones.

This commit is contained in:
Jeija
2012-12-26 22:54:28 +01:00
parent c508bfaea6
commit d91e0b66cb
10 changed files with 1029 additions and 397 deletions

View File

@ -413,45 +413,45 @@ end
--Rules rotation Functions:
function mesecon:rotate_rules_right(rules)
local nr={};
local nr = {}
for i, rule in ipairs(rules) do
nr[i]={}
nr[i].z=rule.x
nr[i].x=-rule.z
nr[i].y=rule.y
table.insert(nr, {
x = -rule.z,
y = rule.y,
z = rule.x})
end
return nr
end
function mesecon:rotate_rules_left(rules)
local nr={};
local nr = {}
for i, rule in ipairs(rules) do
nr[i]={}
nr[i].z=-rules[i].x
nr[i].x=rules[i].z
nr[i].y=rules[i].y
table.insert(nr, {
x = rule.z,
y = rule.y,
z = -rule.x})
end
return nr
end
function mesecon:rotate_rules_down(rules)
local nr={};
local nr = {}
for i, rule in ipairs(rules) do
nr[i]={}
nr[i].y=rule.x
nr[i].x=-rule.y
nr[i].z=rule.z
table.insert(nr, {
x = -rule.y,
y = rule.x,
z = rule.z})
end
return nr
end
function mesecon:rotate_rules_up(rules)
local nr={};
local nr = {}
for i, rule in ipairs(rules) do
nr[i]={}
nr[i].y=-rule.x
nr[i].x=rule.y
nr[i].z=rule.z
table.insert(nr, {
x = rule.y,
y = -rule.x,
z = rule.z})
end
return nr
end

View File

@ -2,8 +2,9 @@ mesecon.on_placenode = function (pos, node)
if mesecon:is_receptor_on(node.name) then
mesecon:receptor_on(pos, mesecon:receptor_get_rules(node))
elseif mesecon:is_powered(pos) then
if mesecon:is_conductor_off(node.name) then
mesecon:turnon(pos, node)
if mesecon:is_conductor(node.name) then
mesecon:turnon (pos)
mesecon:receptor_on (pos, mesecon:conductor_get_rules(node))
else
mesecon:changesignal(pos, node)
mesecon:activate(pos, node)
@ -17,7 +18,7 @@ end
mesecon.on_dignode = function (pos, node)
if mesecon:is_conductor_on(node.name) then
mesecon:receptor_off(pos)
mesecon:receptor_off(pos, mesecon:conductor_get_rules(node))
elseif mesecon:is_receptor_on(node.name) then
mesecon:receptor_off(pos, mesecon:receptor_get_rules(node))
end

View File

@ -3,3 +3,4 @@ BLINKY_PLANT_INTERVAL = 3
NEW_STYLE_WIRES = true -- true = new nodebox wires, false = old raillike wires
PRESSURE_PLATE_INTERVAL = 0.1
OBJECT_DETECTOR_RADIUS = 6
PISTON_MAXIMUM_PUSH = 15