Mirrorlandia_minetest/digtron
1
0
Fork 0
mirror of https://github.com/minetest-mods/digtron.git synced 2024-07-02 14:00:25 +02:00
Code Issues Projects Releases Wiki Activity

Fix rotation and controller being single-use

Browse Source
This commit is contained in:
Gabriel Pérez-Cerezo 2020-04-02 21:48:28 +02:00 committed by SmallJoker
parent c6611fdede
commit 972b6919dc
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nodes/node_axle.lua
View File

@ -35,13 +35,25 @@ minetest.register_node("digtron:axle", {
{-0.25, -0.3125, -0.25, 0.25, 0.3125, 0.25}, -- Axle
}
},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local meta = minetest.get_meta(pos)
if meta:get_string("waiting") == "true" then
-- new delay code without nodetimer (lost on crating)
local now = minetest.get_gametime()
local last_time = tonumber(meta:get_string("last_time")) or 0
-- if meta:get_string("waiting") == "true" then
if last_time + digtron.config.cycle_time*2 > now then
-- Been too soon since last time the digtron rotated.
-- added for clarity
meta:set_string("infotext", S("repetition delay"))
return
end
local image = DigtronLayout.create(pos, clicker)
if image:rotate_layout_image(node.param2) == false then
-- This should be impossible, but if self-validation fails abort.
@ -53,7 +65,9 @@ minetest.register_node("digtron:axle", {
meta = minetest.get_meta(pos)
meta:set_string("waiting", "true")
meta:set_string("infotext", nil)
minetest.get_node_timer(pos):start(digtron.config.cycle_time*2)
-- minetest.get_node_timer(pos):start(digtron.config.cycle_time*2)
-- new delay code
meta:set_string("last_time",tostring(minetest.get_gametime()))
else
meta:set_string("infotext", "unrecoverable write_layout_image error")
end

20
nodes/node_controllers.lua
View File

@ -54,9 +54,19 @@ minetest.register_node("digtron:controller", {
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local meta = minetest.get_meta(pos)
if meta:get_string("waiting") == "true" then
-- Been too soon since last time the digtron did a cycle.
return
-- new delay code without nodetimer (lost on crating)
local now = minetest.get_gametime()
local last_time = (tonumber(meta:get_string("last_time")) or 0 )
-- if meta:get_string("waiting") == "true" then
if last_time + digtron.config.cycle_time > now then
-- Been too soon since last time the digtron did a cycle.
-- added for clarity
meta:set_string("infotext", S("repetition delay"))
return
end
local newpos, status, return_code = digtron.execute_dig_cycle(pos, clicker)
@ -68,7 +78,9 @@ minetest.register_node("digtron:controller", {
-- Start the delay before digtron can run again.
minetest.get_meta(newpos):set_string("waiting", "true")
minetest.get_node_timer(newpos):start(digtron.config.cycle_time)
-- minetest.get_node_timer(newpos):start(digtron.config.cycle_time)
-- new delay code
meta:set_string("last_time",tostring(minetest.get_gametime()))
end,
on_timer = function(pos, elapsed)