Add pistons

diff --git a/mods/redstone/button.lua b/mods/redstone/button.lua
index 79ed1473c7e301e41f6e0aebb3694633e6637f0e..4ff0248398ee15c037b10771750a09de8e5369b6 100644 (file)
--- a/mods/redstone/button.lua
+++ b/mods/redstone/button.lua
@@ -1,5 +1,11 @@
 local minetest,table,vector = minetest,table,vector
 
+local excluded_mods = {redstone=true,door=true}
+local registered_nodes
+minetest.register_on_mods_loaded(function()
+       registered_nodes  = minetest.registered_nodes
+end)
+
 minetest.register_node("redstone:button_off", {
     description = "Button",
     tiles = {"stone.png"},
@@ -18,6 +24,16 @@ minetest.register_node("redstone:button_off", {
                                {-0.25, -0.5,  -0.15, 0.25,  -0.3, 0.15},
                        },
                },
+       on_construct = function(pos)
+               local param2 = minetest.get_node(pos).param2
+               local dir = minetest.wallmounted_to_dir(param2)
+               local node = minetest.get_node(vector.add(pos,dir)).name
+               if excluded_mods[registered_nodes[node].mod_origin] then
+                       minetest.swap_node(pos,{name="air"})
+                       redstone.inject(pos,nil)
+                       minetest.throw_item(pos, "redstone:button_off")
+               end
+       end,
     on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
                minetest.swap_node(pos, {name="redstone:button_on",param2=node.param2})
 

diff --git a/mods/redstone/init.lua b/mods/redstone/init.lua
index 2bb0d25cf0cfe3e7b2782936bda52be08e4cd072..ee886ba3c99867975ac66aa2533a5cb6b790e104 100644 (file)
--- a/mods/redstone/init.lua
+++ b/mods/redstone/init.lua
@@ -43,14 +43,14 @@ function redstone.register_activator(data)
 end
 
 local path = minetest.get_modpath("redstone")
---dofile(path.."/functions.lua")
+dofile(path.."/functions.lua")
 --dofile(path.."/wire.lua")
 dofile(path.."/torch.lua")
 dofile(path.."/lever.lua")
 dofile(path.."/button.lua")
 dofile(path.."/repeater.lua")
 dofile(path.."/light.lua")
---dofile(path.."/piston.lua")
+dofile(path.."/piston.lua")
 --dofile(path.."/comparator.lua")
 --dofile(path.."/craft.lua")
 --dofile(path.."/ore.lua")
@@ -141,24 +141,27 @@ local n_pos
 local temp_pool
 local temp_pool2
 local non_directional_activator = function(pos)
-       temp_pool = pool[pos.x][pos.y][pos.z]
-       for _,order in pairs(order) do
-               n_pos = add_vec(pos,order)
-               if pool[n_pos.x] and pool[n_pos.x][n_pos.y] and pool[n_pos.x][n_pos.y][n_pos.z] then
-                       temp_pool2 = pool[n_pos.x][n_pos.y][n_pos.z]
-                       if temp_pool2 then
-                               if (not temp_pool2.directional_activator and temp_pool2.torch) or 
-                               (temp_pool2.dust and temp_pool2.dust > 0) then
-                                       if activator_table[temp_pool.name].activate then
-                                               activator_table[temp_pool.name].activate(pos)
+       if pool[pos.x] and pool[pos.x][pos.y] and pool[pos.x][pos.y][pos.z] then
+               temp_pool = pool[pos.x][pos.y][pos.z]
+               for _,order in pairs(order) do
+                       n_pos = add_vec(pos,order)
+                       if pool[n_pos.x] and pool[n_pos.x][n_pos.y] and pool[n_pos.x][n_pos.y][n_pos.z] then
+                               temp_pool2 = pool[n_pos.x][n_pos.y][n_pos.z]
+                               if temp_pool2 then
+                                       if (not temp_pool2.directional_activator and temp_pool2.torch) or 
+                                       (temp_pool2.dust and temp_pool2.dust > 0) or 
+                                       (temp_pool2.torch_directional and vector.equals(temp_pool2.output, pos)) then
+                                               if activator_table[temp_pool.name].activate then
+                                                       activator_table[temp_pool.name].activate(pos)
+                                               end
+                                               return
                                        end
-                                       return
                                end
                        end
+               end     
+               if activator_table[temp_pool.name].deactivate then
+                       activator_table[temp_pool.name].deactivate(pos)
                end
-       end     
-       if activator_table[temp_pool.name].deactivate then
-               activator_table[temp_pool.name].deactivate(pos)
        end
 end
 

diff --git a/mods/redstone/lever.lua b/mods/redstone/lever.lua
index b2e4817f1d67583cc9b52ddf1466ae9b34adae5e..cda34c877a26ac45538738cfb61b997ac2cd30b8 100644 (file)
--- a/mods/redstone/lever.lua
+++ b/mods/redstone/lever.lua
@@ -4,6 +4,11 @@ minetest,vector,math,pairs
 =
 minetest,vector,math,pairs
 
+local excluded_mods = {redstone=true,door=true}
+local registered_nodes
+minetest.register_on_mods_loaded(function()
+       registered_nodes  = minetest.registered_nodes
+end)
 
 minetest.register_node("redstone:lever_on", {
     description = "Lever On",
@@ -87,6 +92,17 @@ minetest.register_node("redstone:lever_off", {
                                {-0.1, -0.5,  -0.3, 0.1,  0, -0.1},
                        },
                },
+
+       on_construct = function(pos)
+               local param2 = minetest.get_node(pos).param2
+               local dir = minetest.wallmounted_to_dir(param2)
+               local node = minetest.get_node(vector.add(pos,dir)).name
+               if excluded_mods[registered_nodes[node].mod_origin] then
+                       minetest.swap_node(pos,{name="air"})
+                       redstone.inject(pos,nil)
+                       minetest.throw_item(pos, "redstone:lever_off")
+               end
+       end,
     on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
                minetest.swap_node(pos, {name="redstone:lever_on",param2=node.param2})
                minetest.sound_play("lever", {pos=pos})

diff --git a/mods/redstone/light.lua b/mods/redstone/light.lua
index cb0096fc22d5d278a813f6da93834b7b70805372..92cdd80c380876a8600ae22ea2e0b66da4443ec7 100644 (file)
--- a/mods/redstone/light.lua
+++ b/mods/redstone/light.lua
@@ -25,17 +25,17 @@ for _,color in pairs(colors) do
     }),
       drop = "redstone:light_off_"..color,
 
-      after_place_node = function(pos, placer, itemstack, pointed_thing)
+      on_construct = function(pos)
         redstone.inject(pos,{
           name = "redstone:light_on_"..color,
           activator = true,
         })
-
-        redstone.update(pos)
+        minetest.after(0,function()
+          redstone.update(pos)
+        end)
       end,
       after_destruct = function(pos, oldnode)
         redstone.inject(pos,nil)
-        redstone.update(pos)
       end
   })
 
@@ -82,18 +82,19 @@ for _,color in pairs(colors) do
       drop = "redstone:light_off_"..color,
       
 
-      after_place_node = function(pos, placer, itemstack, pointed_thing)
+      on_construct = function(pos)
         redstone.inject(pos,{
           name = "redstone:light_off_"..color,
           activator = true,
         })
 
-        redstone.update(pos)
+        minetest.after(0,function()
+          redstone.update(pos)
+        end)
       end,
       
       after_destruct = function(pos, oldnode)
-        redstone.inject(pos,nil)
-        redstone.update(pos)
+          redstone.inject(pos,nil)
       end
   })
 

diff --git a/mods/redstone/piston.lua b/mods/redstone/piston.lua
index baa3843232c1d84651c231c80c34916ca25210fd..fea1f65b9cf48e6c91eb020ba7c2039d4d41dd13 100644 (file)
--- a/mods/redstone/piston.lua
+++ b/mods/redstone/piston.lua
@@ -1,22 +1,73 @@
 local minetest,math,ipairs,vector,table = minetest,math,ipairs,vector,table
 --exclude certain mods and nodes from being pushed and pulled to stop glitches
+local registered_nodes
+minetest.register_on_mods_loaded(function()
+       registered_nodes  = minetest.registered_nodes
+end)
+
 local excluded_mods = {utility=true,craftingtable=true,buildtest=true,sign=true,bed=true}
-local excluded_nodes = {["redstone:piston_on"]=true,["redstone:sticky_piston_on"]=true,["redstone:actuator"]=true,["redstone:sticky_actuator"]=true}
+local excluded_nodes = {
+       ["redstone:piston_on"]=true,
+       ["redstone:sticky_piston_on"]=true,
+       ["redstone:actuator"]=true,
+       ["redstone:sticky_actuator"]=true,
+       ["redstone:inverter_on"]=true,
+       ["redstone:inverter_off"]=true,
+       ["redstone:torch_wall"]=true,
+       ["redstone:torch_floor"]=true,
+       ["redstone:lever_on"]=true,
+       ["redstone:lever_off"]=true,
+       ["redstone:button_on"]=true,
+       ["redstone:button_off"]=true,
+}
+for i = 0,8 do
+       excluded_nodes["redstone:dust_"..i] = true
+end
+for i = 0,7 do
+       excluded_nodes["redstone:repeater_on_"..i] = true
+       excluded_nodes["redstone:repeater_off_"..i] = true
+end
+for i = 0,9 do
+       excluded_nodes["redstone:comparator_"..i] = true
+end
+for i = 0,9 do
+       excluded_nodes["redstone:pressure_plate_"..i] = true
+end
+for i = 0,1 do
+       excluded_nodes["redstone:ore_"..i] = true
+end
+
+
+--[[
+███████╗██╗   ██╗███╗   ██╗ ██████╗████████╗██╗ ██████╗ ███╗   ██╗
+██╔════╝██║   ██║████╗  ██║██╔════╝╚══██╔══╝██║██╔═══██╗████╗  ██║
+█████╗  ██║   ██║██╔██╗ ██║██║        ██║   ██║██║   ██║██╔██╗ ██║
+██╔══╝  ██║   ██║██║╚██╗██║██║        ██║   ██║██║   ██║██║╚██╗██║
+██║     ╚██████╔╝██║ ╚████║╚██████╗   ██║   ██║╚██████╔╝██║ ╚████║
+╚═╝      ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝   ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝
+]]
 
 --this is how the piston pushes nodes
-local function piston_push_nodes(pos,dir)
-       local move_index = {}
-       local space = false
+local move_index
+local space
+local index_pos
+local node
+local param2
+local def
+local push
+local index
+local function push_nodes(pos,dir)
+       move_index = {}
+       space = false
        for i = 1,30 do
-               local index_pos = vector.multiply(dir,i)
-               local index_pos = vector.add(index_pos,pos)
-               local node = minetest.get_node(index_pos)
-               local param2 = node.param2
-               local def = minetest.registered_nodes[node.name]
-               local name = node.name
-               local push = ((excluded_mods[def.mod_origin] ~= true) and (excluded_nodes[name] ~= true))
+               index_pos = vector.add(vector.multiply(dir,i),pos)
+               node = minetest.get_node(index_pos)
+               param2 = node.param2
+               def = minetest.registered_nodes[node.name]
+               name = node.name
+               push = ((excluded_mods[def.mod_origin] ~= true) and (excluded_nodes[name] ~= true))
                if push and name ~= "air" then
-                       local index = {}
+                       index = {}
                        index.pos = index_pos
                        index.name = name
                        index.param2 = param2
@@ -29,28 +80,48 @@ local function piston_push_nodes(pos,dir)
                        break
                end             
        end
+
        --check if room to move and objects in log
        if space == true and next(move_index) then
-               for i = 1,table.getn(move_index) do
-                       move_index[i].pos = vector.add(move_index[i].pos,dir)
-                       minetest.set_node(move_index[i].pos,{name=move_index[i].name,param2=move_index[i].param2})
+               if table.getn(move_index) == 1 and minetest.get_item_group(move_index[1].name, "falling_node") > 0 then
+                       for i = 1,table.getn(move_index) do
+                               print("trying")
+                               move_index[i].pos = vector.add(move_index[i].pos,dir)
+                               minetest.set_node(move_index[i].pos,{name="air"})
+
+                               local obj = minetest.add_entity(vector.add(move_index[i].pos,dir), "__builtin:falling_node")
+                               obj:get_luaentity():set_node({name=move_index[i].name})
+                               obj:set_velocity(vector.multiply(dir,19))
+                       end
+               else
+                       for i = 1,table.getn(move_index) do
+                               move_index[i].pos = vector.add(move_index[i].pos,dir)
+                               minetest.set_node(move_index[i].pos,move_index[i])
+                               minetest.check_for_falling(move_index[i].pos)
+                       end
                end
        end
        return(space)
 end
 
 --this is the logic of the piston
-local function piston_push(pos)
+local facedir
+local dir
+local piston_location
+local worked
+local function actuator_arm_function(pos)
        --this is where the piston activates
-       local facedir = minetest.get_node(pos).param2
-       local dir = minetest.facedir_to_dir(facedir)
-       local piston_location = vector.add(pos,dir)
-       local worked = piston_push_nodes(pos,dir)
+       facedir = minetest.get_node(pos).param2
+       dir = minetest.facedir_to_dir(facedir)
+       piston_location = vector.add(pos,dir)
+       worked = push_nodes(pos,dir)
        local node = minetest.get_node(vector.add(pos,dir)).name
+       
        if worked == true then
                --push player
                if node == "air" then
                        for _,object in ipairs(minetest.get_objects_inside_radius(piston_location, 2)) do
+
                                if object:is_player() and object:get_hp() > 0 then
                                        local pos2 = object:get_pos()
                                        local compare = vector.subtract(pos2,piston_location)
@@ -66,20 +137,56 @@ local function piston_push(pos)
                                        elseif dir.x ~=0 or dir.z ~= 0 then
                                                if real_y <= 0.5 and real_y >= -1.6 and compare.x < 0.8 and compare.z < 0.8 then
                                                        object:move_to(vector.add(dir,pos2))
-                                                       object:add_player_velocity(vector.multiply(dir,20))
-                                               
+                                                       object:add_player_velocity(vector.multiply(dir,19))
                                                end
                                        end
+                               elseif not object:is_player() and object:get_luaentity().name == "__builtin:falling_node" then
+                                       local pos2 = object:get_pos()
+                                       local compare = vector.subtract(pos2,piston_location)
+                                       local real_y = compare.y
+                                       compare = vector.abs(compare)
+                                       if compare.y <= 1.5 and compare.x <= 1.5 and compare.z <= 1.5 then
+                                               object:move_to(vector.add(dir,pos2))
+                                               object:add_velocity(vector.multiply(dir,20))
+                                       end
+                               elseif not object:is_player() and object:get_luaentity().name == "__builtin:item" then
+                                       local pos2 = object:get_pos()
+                                       local compare = vector.subtract(pos2,piston_location)
+                                       local real_y = compare.y
+                                       compare = vector.abs(compare)
+                                       if compare.y <= 1 and compare.x <= 1 and compare.z <= 1 then
+                                               object:move_to(vector.add(dir,pos2))
+                                               object:add_velocity(vector.multiply(dir,20))
+                                               object:get_luaentity().poll_timer = 0
+                                       end
                                end
                        end
                end
                minetest.sound_play("piston", {pos=pos,pitch=math.random(85,100)/100})
                minetest.set_node(piston_location,{name="redstone:actuator",param2=facedir})
-               minetest.set_node(pos,{name="redstone:piston_on",param2=facedir})
+               minetest.swap_node(pos,{name="redstone:piston_on",param2=facedir})
+
+               redstone.inject(pos,{
+                       name = "redstone:piston_on",
+                       activator = true,
+               })
+               minetest.after(0,function()
+                       redstone.update(pos)
+               end)
        end
 end
 
 
+--[[
+ ██████╗ ███████╗███████╗
+██╔═══██╗██╔════╝██╔════╝
+██║   ██║█████╗  █████╗  
+██║   ██║██╔══╝  ██╔══╝  
+╚██████╔╝██║     ██║     
+ ╚═════╝ ╚═╝     ╚═╝     
+]]
+
+
 minetest.register_node("redstone:piston_off", {
     description = "Piston",
     tiles = {"redstone_piston.png","redstone_piston.png^[transformR180","redstone_piston.png^[transformR270","redstone_piston.png^[transformR90","wood.png","stone.png"},
@@ -88,21 +195,57 @@ minetest.register_node("redstone:piston_off", {
     sounds = main.stoneSound(),
     drop = "redstone:piston_off",
     paramtype = "light",
-    sunlight_propagates = true,
-    redstone_activation = function(pos)
-               if minetest.get_node(pos).name == "redstone:piston_off" then
-                       piston_push(pos)
-               end
-    end,
+       sunlight_propagates = true,
     --reverse the direction to face the player
     after_place_node = function(pos, placer, itemstack, pointed_thing)
                local look = placer:get_look_dir()
                look = vector.multiply(look,-1)
                local dir = minetest.dir_to_facedir(look, true)
-               minetest.set_node(pos,{name="redstone:piston_off",param2=dir})
-               redstone.collect_info(pos)
+               minetest.swap_node(pos,{name="redstone:piston_off",param2=dir})
+               redstone.inject(pos,{
+                       name = "redstone:piston_off",
+                       activator = true,
+               })
+               redstone.update(pos)
+       end,
+       after_destruct = function(pos, oldnode)
+               redstone.inject(pos,nil)
     end,
 })
+
+
+redstone.register_activator({
+       name = "redstone:piston_off",
+       activate = function(pos)
+               actuator_arm_function(pos)
+       end
+})
+
+minetest.register_lbm({
+       name = "redstone:piston_off",
+       nodenames = {"redstone:piston_off"},
+       run_at_every_load = true,
+       action = function(pos)
+               redstone.inject(pos,{
+                       name = "redstone:piston_off",
+                       activator = true,
+               })
+               minetest.after(0,function()
+                       redstone.update(pos)
+               end)
+       end,
+})
+
+
+--[[
+ ██████╗ ███╗   ██╗
+██╔═══██╗████╗  ██║
+██║   ██║██╔██╗ ██║
+██║   ██║██║╚██╗██║
+╚██████╔╝██║ ╚████║
+ ╚═════╝ ╚═╝  ╚═══╝
+]]
+
 minetest.register_node("redstone:piston_on", {
     description = "Piston",
     tiles = {"redstone_piston.png","redstone_piston.png^[transformR180","redstone_piston.png^[transformR270","redstone_piston.png^[transformR90","stone.png","stone.png"},
@@ -119,25 +262,60 @@ minetest.register_node("redstone:piston_on", {
                                {-0.5, -0.5,  -0.5, 0.5,  0.5, 3/16},
                        },
                },
-    redstone_deactivation = function(pos)
-               --this is where the piston deactivates
-               local facedir = minetest.get_node(pos).param2
+    after_destruct = function(pos, oldnode)
+               local facedir = oldnode.param2
                local dir = minetest.facedir_to_dir(facedir)
                local piston_location = vector.add(pos,dir)
                minetest.remove_node(piston_location)
-               minetest.set_node(pos,{name="redstone:piston_off",param2=facedir})
-               piston_location.y = piston_location.y + 1
-               minetest.punch_node(piston_location)
-               minetest.sound_play("piston", {pos=pos,pitch=math.random(85,100)/100})
+               redstone.inject(pos,nil)
     end,
-    after_dig_node = function(pos, oldnode, oldmetadata, digger)
-               local facedir = oldnode.param2
+})
+
+minetest.register_lbm({
+       name = "redstone:piston_on",
+       nodenames = {"redstone:piston_on"},
+       run_at_every_load = true,
+       action = function(pos)
+               redstone.inject(pos,{
+                       name = "redstone:piston_on",
+                       activator = true,
+               })
+               minetest.after(0,function()
+                       redstone.update(pos)
+               end)
+       end,
+})
+
+redstone.register_activator({
+       name = "redstone:piston_on",
+       deactivate = function(pos)
+               --this is where the piston deactivates
+               local facedir = minetest.get_node(pos).param2
                local dir = minetest.facedir_to_dir(facedir)
                local piston_location = vector.add(pos,dir)
                minetest.remove_node(piston_location)
-    end,
+               minetest.swap_node(pos,{name="redstone:piston_off",param2=facedir})
+               piston_location.y = piston_location.y + 1
+               minetest.sound_play("piston", {pos=pos,pitch=math.random(85,100)/100})
+               redstone.inject(pos,{
+                       name = "redstone:piston_off",
+                       activator = true,
+               })
+       end
 })
 
+
+--[[
+ █████╗ ██████╗ ███╗   ███╗
+██╔══██╗██╔══██╗████╗ ████║
+███████║██████╔╝██╔████╔██║
+██╔══██║██╔══██╗██║╚██╔╝██║
+██║  ██║██║  ██║██║ ╚═╝ ██║
+╚═╝  ╚═╝╚═╝  ╚═╝╚═╝     ╚═╝
+]]
+
+
+
 minetest.register_node("redstone:actuator", {
     description = "Piston Actuator",
     tiles = {"wood.png"},
@@ -155,7 +333,7 @@ minetest.register_node("redstone:actuator", {
                                {-0.15, -0.15,  -0.9, 0.15,  0.15, 0.5}, --actuator
                        },
                },
-       after_dig_node = function(pos, oldnode, oldmetadata, digger)
+       after_destruct = function(pos, oldnode)
                local facedir = oldnode.param2
                local dir = minetest.facedir_to_dir(facedir)
                dir = vector.multiply(dir,-1)
@@ -164,6 +342,7 @@ minetest.register_node("redstone:actuator", {
     end,
 })
 
+--[[
 -------------------------------------------------------------------------------------------------------------------------------------------------------
 --this is how the piston pushes nodes
 local function sticky_piston_push_nodes(pos,dir)
@@ -401,3 +580,5 @@ minetest.register_node("redstone:sticky_actuator", {
                minetest.remove_node(piston_location)
     end,
 })
+]]--
+