From 08a391e4ccb78ed6be7ae4a710b146b7890ddce9 Mon Sep 17 00:00:00 2001 From: cheapie Date: Tue, 12 Jan 2016 22:22:44 -0600 Subject: Move the "boom barrier" to animated textures and make the last gate light stay on solid --- infrastructure/advanced_boom_barrier.lua | 926 +++++++++++---------- ...structure_boom_barrier_arm_h_anim_darkfirst.png | Bin 0 -> 762 bytes ...tructure_boom_barrier_arm_h_anim_lightfirst.png | Bin 0 -> 811 bytes ...tructure_boom_barrier_arm_h_left_right_dark.png | Bin 481 -> 0 bytes 4 files changed, 482 insertions(+), 444 deletions(-) create mode 100644 infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png create mode 100644 infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png delete mode 100644 infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_dark.png diff --git a/infrastructure/advanced_boom_barrier.lua b/infrastructure/advanced_boom_barrier.lua index 7a1d685..67a9b8b 100644 --- a/infrastructure/advanced_boom_barrier.lua +++ b/infrastructure/advanced_boom_barrier.lua @@ -1,470 +1,508 @@ -- Boom barrier - function move_arm(pos, node) - local node = minetest.env:get_node(pos) - local param2 = node.param2 - - if param2 == 0 then - dir = "z-" - elseif param2 == 1 then - dir = "x-" - elseif param2 == 2 then - dir = "z+" - elseif param2 == 3 then - dir = "x+" - end +function move_arm(pos, node) + local node = minetest.env:get_node(pos) + local param2 = node.param2 + + if param2 == 0 then + dir = "z-" + elseif param2 == 1 then + dir = "x-" + elseif param2 == 2 then + dir = "z+" + elseif param2 == 3 then + dir = "x+" + end - minetest.sound_play("infrastructure_boom_barrier", { - pos = pos, - gain = BOOM_BARRIER_VOLUME, - max_hear_distance = 50 - }) + minetest.sound_play("infrastructure_boom_barrier", { + pos = pos, + gain = BOOM_BARRIER_VOLUME, + max_hear_distance = 50 + }) - if node.name == "infrastructure:boom_barrier_top_h" then - minetest.swap_node(pos, {name = "infrastructure:boom_barrier_top_v", param2 = node.param2}) + if node.name == "infrastructure:boom_barrier_top_h" then + minetest.swap_node(pos, {name = "infrastructure:boom_barrier_top_v", param2 = node.param2}) - if dir == "x+" then - for i = 1, 10 do - pos.x = pos.x + 1 - if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_bright") - or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_dark")) == nil then - break - end - minetest.env:remove_node(pos) - node.name = "infrastructure:boom_barrier_arm_v" - minetest.env:add_node({x=pos.x-i, y=pos.y+i, z=pos.z}, node) - end - elseif dir == "x-" then - for i = 1, 10 do + if dir == "x+" then + for i = 1, 10 do + pos.x = pos.x + 1 + if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then pos.x = pos.x - 1 - if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_bright") - or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_dark")) == nil then - break - end - minetest.env:remove_node(pos) - node.name = "infrastructure:boom_barrier_arm_v" - minetest.env:add_node({x=pos.x+i, y=pos.y+i, z=pos.z}, node) + break + end + minetest.env:remove_node(pos) + node.name = "infrastructure:boom_barrier_arm_v" + minetest.env:add_node({x=pos.x-i, y=pos.y+i, z=pos.z}, node) + end + elseif dir == "x-" then + for i = 1, 10 do + pos.x = pos.x - 1 + if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then + break end - elseif dir == "z+" then - for i = 1, 10 do - pos.z = pos.z + 1 - if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_bright") - or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_dark")) == nil then - break - end - minetest.env:remove_node(pos) - node.name = "infrastructure:boom_barrier_arm_v" - minetest.env:add_node({x=pos.x, y=pos.y+i, z=pos.z-i}, node) + minetest.env:remove_node(pos) + node.name = "infrastructure:boom_barrier_arm_v" + minetest.env:add_node({x=pos.x+i, y=pos.y+i, z=pos.z}, node) + end + elseif dir == "z+" then + for i = 1, 10 do + pos.z = pos.z + 1 + if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then + break end - elseif dir == "z-" then - for i = 1, 10 do - pos.z = pos.z - 1 - if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_bright") - or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_dark")) == nil then - break - end - minetest.env:remove_node(pos) - node.name = "infrastructure:boom_barrier_arm_v" - minetest.env:add_node({x=pos.x, y=pos.y+i, z=pos.z+i}, node) + minetest.env:remove_node(pos) + node.name = "infrastructure:boom_barrier_arm_v" + minetest.env:add_node({x=pos.x, y=pos.y+i, z=pos.z-i}, node) + end + elseif dir == "z-" then + for i = 1, 10 do + pos.z = pos.z - 1 + if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end") + or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then + break end + minetest.env:remove_node(pos) + node.name = "infrastructure:boom_barrier_arm_v" + minetest.env:add_node({x=pos.x, y=pos.y+i, z=pos.z+i}, node) end + end - elseif node.name == "infrastructure:boom_barrier_top_v" then - minetest.swap_node(pos, {name = "infrastructure:boom_barrier_top_h", param2 = node.param2}) - if dir == "x+" then - for i = 1, 10 do - pos.y = pos.y + 1 - if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then - break - end - minetest.env:remove_node(pos) - if i % 2 == 1 then - node.name = "infrastructure:boom_barrier_arm_h_bright" - else - node.name = "infrastructure:boom_barrier_arm_h_dark" - end - minetest.env:add_node({x=pos.x+i, y=pos.y-i, z=pos.z}, node) + elseif node.name == "infrastructure:boom_barrier_top_v" then + minetest.swap_node(pos, {name = "infrastructure:boom_barrier_top_h", param2 = node.param2}) + if dir == "x+" then + for i = 1, 10 do + pos.y = pos.y + 1 + if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then + break + end + minetest.env:remove_node(pos) + if i % 2 == 1 then + node.name = "infrastructure:boom_barrier_arm_h_lightfirst" + else + node.name = "infrastructure:boom_barrier_arm_h_darkfirst" + end + if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then + node.name = "infrastructure:boom_barrier_arm_h_end" end - elseif dir == "x-" then - for i = 1, 10 do - pos.y = pos.y + 1 - if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then - break - end - minetest.env:remove_node(pos) - if i % 2 == 1 then - node.name = "infrastructure:boom_barrier_arm_h_bright" - else - node.name = "infrastructure:boom_barrier_arm_h_dark" - end - minetest.env:add_node({x=pos.x-i, y=pos.y-i, z=pos.z}, node) + minetest.env:add_node({x=pos.x+i, y=pos.y-i, z=pos.z}, node) + end + elseif dir == "x-" then + for i = 1, 10 do + pos.y = pos.y + 1 + if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then + break + end + minetest.env:remove_node(pos) + if i % 2 == 1 then + node.name = "infrastructure:boom_barrier_arm_h_lightfirst" + else + node.name = "infrastructure:boom_barrier_arm_h_darkfirst" + end + if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then + node.name = "infrastructure:boom_barrier_arm_h_end" + end + minetest.env:add_node({x=pos.x-i, y=pos.y-i, z=pos.z}, node) + end + elseif dir == "z+" then + for i = 1, 10 do + pos.y = pos.y + 1 + if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then + break + end + minetest.env:remove_node(pos) + if i % 2 == 1 then + node.name = "infrastructure:boom_barrier_arm_h_lightfirst" + else + node.name = "infrastructure:boom_barrier_arm_h_darkfirst" + end + if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then + node.name = "infrastructure:boom_barrier_arm_h_end" end - elseif dir == "z+" then - for i = 1, 10 do - pos.y = pos.y + 1 - if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then - break - end - minetest.env:remove_node(pos) - if i % 2 == 1 then - node.name = "infrastructure:boom_barrier_arm_h_bright" - else - node.name = "infrastructure:boom_barrier_arm_h_dark" - end - minetest.env:add_node({x=pos.x, y=pos.y-i, z=pos.z+i}, node) + minetest.env:add_node({x=pos.x, y=pos.y-i, z=pos.z+i}, node) + end + elseif dir == "z-" then + for i = 1, 10 do + pos.y = pos.y + 1 + if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then + break + end + minetest.env:remove_node(pos) + if i % 2 == 1 then + node.name = "infrastructure:boom_barrier_arm_h_lightfirst" + else + node.name = "infrastructure:boom_barrier_arm_h_darkfirst" end - elseif dir == "z-" then - for i = 1, 10 do - pos.y = pos.y + 1 - if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then - break - end - minetest.env:remove_node(pos) - if i % 2 == 1 then - node.name = "infrastructure:boom_barrier_arm_h_bright" - else - node.name = "infrastructure:boom_barrier_arm_h_dark" - end - minetest.env:add_node({x=pos.x, y=pos.y-i, z=pos.z-i}, node) + if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then + node.name = "infrastructure:boom_barrier_arm_h_end" end + minetest.env:add_node({x=pos.x, y=pos.y-i, z=pos.z-i}, node) end end end +end + +minetest.register_node("infrastructure:boom_barrier_top_h", { + description = "Boom barrier mechanism", + tiles = { + "infrastructure_boom_barrier_h_top.png", + "infrastructure_boom_barrier_h_bottom.png", + "infrastructure_boom_barrier_h_right.png", + "infrastructure_boom_barrier_h_left.png", + "infrastructure_boom_barrier_h_front_back.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + node_box = { + type = "fixed", + fixed = { + {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, + {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, + + {-3/8, -1/2, -1/2, -1/4, -1/4, 1/8}, + {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, + {-3/8, -1/8, -1/8, -1/4, 1/8, 1/2}, + {-1/2, -3/16, 1/4, -3/8, 3/16, 1/2}, + {-1/2, -1/8, 3/16, -3/8, 1/8, 1/2}, + {-1/2, -1/16, 1/8, -3/8, 1/16, 1/2}, + + {1/4, -1/2, -1/2, 3/8, -1/4, 1/8}, + {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, + {1/4, -1/8, -1/8, 3/8, 1/8, 1/2}, + {3/8, -3/16, 1/4, 1/2, 3/16, 1/2}, + {3/8, -1/8, 3/16, 1/2, 1/8, 1/2}, + {3/8, -1/16, 1/8, 1/2, 1/16, 1/2}, + + {-3/8, -1/2, -1/2, 3/8, -1/4, -3/8}, + + {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, + {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, + + {-3/8, -1/2, -1/2, -1/4, -1/4, 1/8}, + {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, + {-3/8, -1/8, -1/8, -1/4, 1/8, 1/2}, + {-1/2, -3/16, 1/4, -3/8, 3/16, 1/2}, + {-1/2, -1/8, 3/16, -3/8, 1/8, 1/2}, + {-1/2, -1/16, 1/8, -3/8, 1/16, 1/2}, + + {1/4, -1/2, -1/2, 3/8, -1/4, 1/8}, + {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, + {1/4, -1/8, -1/8, 3/8, 1/8, 1/2}, + {3/8, -3/16, 1/4, 1/2, 3/16, 1/2}, + {3/8, -1/8, 3/16, 1/2, 1/8, 1/2}, + {3/8, -1/16, 1/8, 1/2, 1/16, 1/2}, + + {-3/8, -1/2, -1/2, 3/8, -1/4, -3/8}, + + {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} + } + }, - minetest.register_abm( { - nodenames = {"infrastructure:boom_barrier_arm_h_bright", "infrastructure:boom_barrier_arm_h_dark"}, - interval = 1, - chance = 1, - action = function(pos, node) - local node = minetest.env:get_node(pos) - if node.name == "infrastructure:boom_barrier_arm_h_bright" then - minetest.swap_node(pos, {name = "infrastructure:boom_barrier_arm_h_dark", param2 = node.param2}) - elseif node.name == "infrastructure:boom_barrier_arm_h_dark" then - minetest.swap_node(pos, {name = "infrastructure:boom_barrier_arm_h_bright", param2 = node.param2}) - end - end - }) + after_place_node = function(pos) + local node = minetest.env:get_node(pos) + node.name = "infrastructure:boom_barrier_bottom" + minetest.env:add_node(pos, node) + pos.y = pos.y + 1 + node.name = "infrastructure:boom_barrier_top_h" + minetest.env:add_node(pos, node) + end, + + after_dig_node = function(pos) + pos.y = pos.y - 1 + minetest.env:remove_node(pos) + end, + + on_punch = function(pos, node) + move_arm(pos, node) + end +}) + +minetest.register_node("infrastructure:boom_barrier_top_v", { + tiles = { + "infrastructure_boom_barrier_h_front_back.png", + "infrastructure_boom_barrier_v_bottom.png", + "infrastructure_boom_barrier_v_right.png", + "infrastructure_boom_barrier_v_left.png", + "infrastructure_boom_barrier_v_front_back.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + drop = "infrastructure:boom_barrier_top_h", + node_box = { + type = "fixed", + fixed = { + {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, + {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, + + {-3/8, -1/8, -1/2, -1/4, 1/2, -1/4}, + {-3/8, -1/8, -1/2, -1/4, 1/8, 1/8}, + {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, + {-1/2, -1/2, -3/16, -3/8, -1/4, 3/16}, + {-1/2, -1/2, -1/8, -3/8, -3/16, 1/8}, + {-1/2, -1/2, -1/16, -3/8, -1/8, 1/16}, + + {1/4, -1/8, -1/2, 3/8, 1/2, -1/4}, + {1/4, -1/8, -1/2, 3/8, 1/8, 1/8}, + {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, + {3/8, -1/2, -3/16, 1/2, -1/4, 3/16}, + {3/8, -1/2, -1/8, 1/2, -3/16, 1/8}, + {3/8, -1/2, -1/16, 1/2, -1/8, 1/16}, + + {-3/8, 3/8, -1/2, 3/8, 1/2, -1/4}, + + {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, + {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, + + {-3/8, -1/8, -1/2, -1/4, 1/2, -1/4}, + {-3/8, -1/8, -1/2, -1/4, 1/8, 1/8}, + {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, + {-1/2, -1/2, -3/16, -3/8, -1/4, 3/16}, + {-1/2, -1/2, -1/8, -3/8, -3/16, 1/8}, + {-1/2, -1/2, -1/16, -3/8, -1/8, 1/16}, + + {1/4, -1/8, -1/2, 3/8, 1/2, -1/4}, + {1/4, -1/8, -1/2, 3/8, 1/8, 1/8}, + {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, + {3/8, -1/2, -3/16, 1/2, -1/4, 3/16}, + {3/8, -1/2, -1/8, 1/2, -3/16, 1/8}, + {3/8, -1/2, -1/16, 1/2, -1/8, 1/16}, + + {-3/8, 3/8, -1/2, 3/8, 1/2, -1/4}, + + {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} + } + }, - minetest.register_node("infrastructure:boom_barrier_top_h", { - description = "Boom barrier mechanism", - tiles = { - "infrastructure_boom_barrier_h_top.png", - "infrastructure_boom_barrier_h_bottom.png", - "infrastructure_boom_barrier_h_right.png", - "infrastructure_boom_barrier_h_left.png", - "infrastructure_boom_barrier_h_front_back.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {cracky = 1}, - node_box = { - type = "fixed", - fixed = { - {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, - {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, - - {-3/8, -1/2, -1/2, -1/4, -1/4, 1/8}, - {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, - {-3/8, -1/8, -1/8, -1/4, 1/8, 1/2}, - {-1/2, -3/16, 1/4, -3/8, 3/16, 1/2}, - {-1/2, -1/8, 3/16, -3/8, 1/8, 1/2}, - {-1/2, -1/16, 1/8, -3/8, 1/16, 1/2}, - - {1/4, -1/2, -1/2, 3/8, -1/4, 1/8}, - {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, - {1/4, -1/8, -1/8, 3/8, 1/8, 1/2}, - {3/8, -3/16, 1/4, 1/2, 3/16, 1/2}, - {3/8, -1/8, 3/16, 1/2, 1/8, 1/2}, - {3/8, -1/16, 1/8, 1/2, 1/16, 1/2}, - - {-3/8, -1/2, -1/2, 3/8, -1/4, -3/8}, - - {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, - {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, - - {-3/8, -1/2, -1/2, -1/4, -1/4, 1/8}, - {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, - {-3/8, -1/8, -1/8, -1/4, 1/8, 1/2}, - {-1/2, -3/16, 1/4, -3/8, 3/16, 1/2}, - {-1/2, -1/8, 3/16, -3/8, 1/8, 1/2}, - {-1/2, -1/16, 1/8, -3/8, 1/16, 1/2}, - - {1/4, -1/2, -1/2, 3/8, -1/4, 1/8}, - {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, - {1/4, -1/8, -1/8, 3/8, 1/8, 1/2}, - {3/8, -3/16, 1/4, 1/2, 3/16, 1/2}, - {3/8, -1/8, 3/16, 1/2, 1/8, 1/2}, - {3/8, -1/16, 1/8, 1/2, 1/16, 1/2}, - - {-3/8, -1/2, -1/2, 3/8, -1/4, -3/8}, - - {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} - } - }, - - after_place_node = function(pos) - local node = minetest.env:get_node(pos) - node.name = "infrastructure:boom_barrier_bottom" - minetest.env:add_node(pos, node) - pos.y = pos.y + 1 - node.name = "infrastructure:boom_barrier_top_h" - minetest.env:add_node(pos, node) - end, - - after_dig_node = function(pos) - pos.y = pos.y - 1 - minetest.env:remove_node(pos) - end, - - on_punch = function(pos, node) - move_arm(pos, node) - end - }) + after_dig_node = function(pos) + pos.y = pos.y - 1 + minetest.env:remove_node(pos) + end, - minetest.register_node("infrastructure:boom_barrier_top_v", { - tiles = { - "infrastructure_boom_barrier_h_front_back.png", - "infrastructure_boom_barrier_v_bottom.png", - "infrastructure_boom_barrier_v_right.png", - "infrastructure_boom_barrier_v_left.png", - "infrastructure_boom_barrier_v_front_back.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {cracky = 1}, - drop = "infrastructure:boom_barrier_top_h", - node_box = { - type = "fixed", - fixed = { - {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, - {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, - - {-3/8, -1/8, -1/2, -1/4, 1/2, -1/4}, - {-3/8, -1/8, -1/2, -1/4, 1/8, 1/8}, - {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, - {-1/2, -1/2, -3/16, -3/8, -1/4, 3/16}, - {-1/2, -1/2, -1/8, -3/8, -3/16, 1/8}, - {-1/2, -1/2, -1/16, -3/8, -1/8, 1/16}, - - {1/4, -1/8, -1/2, 3/8, 1/2, -1/4}, - {1/4, -1/8, -1/2, 3/8, 1/8, 1/8}, - {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, - {3/8, -1/2, -3/16, 1/2, -1/4, 3/16}, - {3/8, -1/2, -1/8, 1/2, -3/16, 1/8}, - {3/8, -1/2, -1/16, 1/2, -1/8, 1/16}, - - {-3/8, 3/8, -1/2, 3/8, 1/2, -1/4}, - - {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/4, -1/4, -1/4, 1/4, 1/4, 1/4}, - {-1/8, -1/2, -1/8, 1/8, -1/4, 1/8}, - - {-3/8, -1/8, -1/2, -1/4, 1/2, -1/4}, - {-3/8, -1/8, -1/2, -1/4, 1/8, 1/8}, - {-3/8, -1/2, -1/8, -1/4, 1/8, 1/8}, - {-1/2, -1/2, -3/16, -3/8, -1/4, 3/16}, - {-1/2, -1/2, -1/8, -3/8, -3/16, 1/8}, - {-1/2, -1/2, -1/16, -3/8, -1/8, 1/16}, - - {1/4, -1/8, -1/2, 3/8, 1/2, -1/4}, - {1/4, -1/8, -1/2, 3/8, 1/8, 1/8}, - {1/4, -1/2, -1/8, 3/8, 1/8, 1/8}, - {3/8, -1/2, -3/16, 1/2, -1/4, 3/16}, - {3/8, -1/2, -1/8, 1/2, -3/16, 1/8}, - {3/8, -1/2, -1/16, 1/2, -1/8, 1/16}, - - {-3/8, 3/8, -1/2, 3/8, 1/2, -1/4}, - - {-7/16, -1/16, -1/16, 7/16, 1/16, 1/16} - } - }, - - after_dig_node = function(pos) - pos.y = pos.y - 1 - minetest.env:remove_node(pos) - end, - - on_punch = function(pos, node) - move_arm(pos, node) + on_punch = function(pos, node) + move_arm(pos, node) + end +}) + +minetest.register_node("infrastructure:boom_barrier_bottom", { + tiles = { + "infrastructure_traffic_lights_side.png", + "infrastructure_traffic_lights_side.png", + "infrastructure_automatic_warning_device_bottom.png", + "infrastructure_automatic_warning_device_bottom.png", + "infrastructure_automatic_warning_device_bottom.png", + "infrastructure_automatic_warning_device_bottom.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + drop = "infrastructure:boom_barrier_top_h", + node_box = { + type = "fixed", + fixed = { + {-1/16, -1/2, -1/16, 1/16, 1/2, 1/16}, + {-1/2, -1/2, -1/4, 1/2, -3/8, 1/4}, + {-1/4, -1/2, -1/2, 1/4, -3/8, 1/2}, + {-1/8, -1/2, -1/8, 1/8, 0, 1/8} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/16, -1/2, -1/16, 1/16, 1/2, 1/16}, + {-1/2, -1/2, -1/4, 1/2, -3/8, 1/4}, + {-1/4, -1/2, -1/2, 1/4, -3/8, 1/2}, + {-1/8, -1/2, -1/8, 1/8, 0, 1/8} + } + }, + + after_dig_node = function(pos) + pos.y = pos.y + 1 + minetest.env:remove_node(pos) + end, + + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", "field[channel;Channel;${channel}]") + end, + + on_receive_fields = function(pos, formname, fields, sender) + if (fields.channel) then + minetest.get_meta(pos):set_string("channel", fields.channel) + minetest.get_meta(pos):set_string("state", "Off") end - }) - - minetest.register_node("infrastructure:boom_barrier_bottom", { - tiles = { - "infrastructure_traffic_lights_side.png", - "infrastructure_traffic_lights_side.png", - "infrastructure_automatic_warning_device_bottom.png", - "infrastructure_automatic_warning_device_bottom.png", - "infrastructure_automatic_warning_device_bottom.png", - "infrastructure_automatic_warning_device_bottom.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {cracky = 1}, - drop = "infrastructure:boom_barrier_top_h", - node_box = { - type = "fixed", - fixed = { - {-1/16, -1/2, -1/16, 1/16, 1/2, 1/16}, - {-1/2, -1/2, -1/4, 1/2, -3/8, 1/4}, - {-1/4, -1/2, -1/2, 1/4, -3/8, 1/2}, - {-1/8, -1/2, -1/8, 1/8, 0, 1/8} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/16, -1/2, -1/16, 1/16, 1/2, 1/16}, - {-1/2, -1/2, -1/4, 1/2, -3/8, 1/4}, - {-1/4, -1/2, -1/2, 1/4, -3/8, 1/2}, - {-1/8, -1/2, -1/8, 1/8, 0, 1/8} - } - }, - - after_dig_node = function(pos) - pos.y = pos.y + 1 - minetest.env:remove_node(pos) - end, - - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", "field[channel;Channel;${channel}]") - end, - - on_receive_fields = function(pos, formname, fields, sender) - if (fields.channel) then - minetest.get_meta(pos):set_string("channel", fields.channel) - minetest.get_meta(pos):set_string("state", "Off") - end - end, - - digiline = { - receptor = {}, - effector = { - action = function(pos, node, channel, msg) - local setchan = minetest.get_meta(pos):get_string("channel") - if setchan ~= channel then - return - end - pos.y = pos.y + 1 - local mechnode = minetest.env:get_node(pos) - if ((msg == "up" and mechnode.name=="infrastructure:boom_barrier_top_h") or (msg == "down" and mechnode.name=="infrastructure:boom_barrier_top_v")) then - move_arm(pos, mechnode) - end + end, + + digiline = { + receptor = {}, + effector = { + action = function(pos, node, channel, msg) + local setchan = minetest.get_meta(pos):get_string("channel") + if setchan ~= channel then + return end - } - }, - }) - - minetest.register_node("infrastructure:boom_barrier_arm_h_bright", { - description = "Boom barrier arm", - tiles = { - "infrastructure_boom_barrier_arm_h_top.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png", - "infrastructure_boom_barrier_arm_h_left_right_bright.png", - "infrastructure_boom_barrier_arm_h_left_right_bright.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {cracky = 1}, - light_source = BOOM_BARRIER_LIGHT_RANGE, - node_box = { - type = "fixed", - fixed = { - {-1/8, -1/2, -1/2, 1/8, -7/16, 1/2}, - {-1/8, -5/16, -1/2, 1/8, -1/4, 1/2}, - {-1/8, -1/2, -1/2, -1/16, -1/4, 1/2}, - {1/16, -1/2, -1/2, 1/8, -1/4, 1/2}, - {0, -1/4, -1/8, 0, 0, 1/8} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/8, -1/2, -1/2, 1/8, -1/4, 1/2} - } + pos.y = pos.y + 1 + local mechnode = minetest.env:get_node(pos) + if ((msg == "up" and mechnode.name=="infrastructure:boom_barrier_top_h") or (msg == "down" and mechnode.name=="infrastructure:boom_barrier_top_v")) then + move_arm(pos, mechnode) + end + end } - }) - - minetest.register_node("infrastructure:boom_barrier_arm_h_dark", { - tiles = { - "infrastructure_boom_barrier_arm_h_top.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png", - "infrastructure_boom_barrier_arm_h_left_right_dark.png", - "infrastructure_boom_barrier_arm_h_left_right_dark.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {cracky = 1}, - drop = "infrastructure:boom_barrier_arm_h_bright", - node_box = { - type = "fixed", - fixed = { - {-1/8, -1/2, -1/2, 1/8, -7/16, 1/2}, - {-1/8, -5/16, -1/2, 1/8, -1/4, 1/2}, - {-1/8, -1/2, -1/2, -1/16, -1/4, 1/2}, - {1/16, -1/2, -1/2, 1/8, -1/4, 1/2}, - {0, -1/4, -1/8, 0, 0, 1/8} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/8, -1/2, -1/2, 1/8, -1/4, 1/2} - } + }, +}) + +minetest.register_node("infrastructure:boom_barrier_arm_h_lightfirst", { + description = "Boom barrier arm", + tiles = { + "infrastructure_boom_barrier_arm_h_top.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + {name="infrastructure_boom_barrier_arm_h_anim_lightfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}, + {name="infrastructure_boom_barrier_arm_h_anim_lightfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}, + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + light_source = BOOM_BARRIER_LIGHT_RANGE, + node_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, -7/16, 1/2}, + {-1/8, -5/16, -1/2, 1/8, -1/4, 1/2}, + {-1/8, -1/2, -1/2, -1/16, -1/4, 1/2}, + {1/16, -1/2, -1/2, 1/8, -1/4, 1/2}, + {0, -1/4, -1/8, 0, 0, 1/8} } - }) - - minetest.register_node("infrastructure:boom_barrier_arm_v", { - tiles = { - "infrastructure_boom_barrier_arm_h_bottom_front_back.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png", - "infrastructure_boom_barrier_arm_v_left.png", - "infrastructure_boom_barrier_arm_v_right.png", - "infrastructure_boom_barrier_arm_h_top.png", - "infrastructure_boom_barrier_arm_h_bottom_front_back.png" - }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - groups = {cracky = 1}, - drop = "infrastructure:boom_barrier_arm_h_bright", - node_box = { - type = "fixed", - fixed = { - {-1/8, -1/2, -1/2, 1/8, 1/2, -7/16}, - {-1/8, -1/2, -5/16, 1/8, 1/2, -1/4}, - {-1/8, -1/2, -1/2, -1/16, 1/2, -1/4}, - {1/16, -1/2, -1/2, 1/8, 1/2, -1/4}, - {0, -1/8, -1/4, 0, 1/8, 0} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-1/8, -1/2, -1/2, 1/8, 1/2, -1/4} - } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, -1/4, 1/2} } - }) + } +}) + +minetest.register_node("infrastructure:boom_barrier_arm_h_darkfirst", { + tiles = { + "infrastructure_boom_barrier_arm_h_top.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + {name="infrastructure_boom_barrier_arm_h_anim_darkfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}, + {name="infrastructure_boom_barrier_arm_h_anim_darkfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}, + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + drop = "infrastructure:boom_barrier_arm_h_lightfirst", + node_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, -7/16, 1/2}, + {-1/8, -5/16, -1/2, 1/8, -1/4, 1/2}, + {-1/8, -1/2, -1/2, -1/16, -1/4, 1/2}, + {1/16, -1/2, -1/2, 1/8, -1/4, 1/2}, + {0, -1/4, -1/8, 0, 0, 1/8} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, -1/4, 1/2} + } + } +}) + +minetest.register_node("infrastructure:boom_barrier_arm_h_end", { + tiles = { + "infrastructure_boom_barrier_arm_h_top.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + "infrastructure_boom_barrier_arm_h_left_right_bright.png", + "infrastructure_boom_barrier_arm_h_left_right_bright.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + drop = "infrastructure:boom_barrier_arm_h_lightfirst", + node_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, -7/16, 1/2}, + {-1/8, -5/16, -1/2, 1/8, -1/4, 1/2}, + {-1/8, -1/2, -1/2, -1/16, -1/4, 1/2}, + {1/16, -1/2, -1/2, 1/8, -1/4, 1/2}, + {0, -1/4, -1/8, 0, 0, 1/8} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, -1/4, 1/2} + } + } +}) + +minetest.register_alias("infrastructure:boom_barrier_arm_h_dark","infrastructure:boom_barrier_arm_h_darkfirst") +minetest.register_alias("infrastructure:boom_barrier_arm_h_bright","infrastructure:boom_barrier_arm_h_lightfirst") + +minetest.register_node("infrastructure:boom_barrier_arm_v", { + tiles = { + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png", + "infrastructure_boom_barrier_arm_v_left.png", + "infrastructure_boom_barrier_arm_v_right.png", + "infrastructure_boom_barrier_arm_h_top.png", + "infrastructure_boom_barrier_arm_h_bottom_front_back.png" + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 1}, + drop = "infrastructure:boom_barrier_arm_h_lightfirst", + node_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, 1/2, -7/16}, + {-1/8, -1/2, -5/16, 1/8, 1/2, -1/4}, + {-1/8, -1/2, -1/2, -1/16, 1/2, -1/4}, + {1/16, -1/2, -1/2, 1/8, 1/2, -1/4}, + {0, -1/8, -1/4, 0, 1/8, 0} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/8, -1/2, -1/2, 1/8, 1/2, -1/4} + } + } +}) - minetest.register_alias("infrastructure:boom_barrier_mechanism", "infrastructure:boom_barrier_top_h") - minetest.register_alias("infrastructure:boom_barrier_arm", "infrastructure:boom_barrier_arm_h_bright") +minetest.register_alias("infrastructure:boom_barrier_mechanism", "infrastructure:boom_barrier_top_h") +minetest.register_alias("infrastructure:boom_barrier_arm", "infrastructure:boom_barrier_arm_h_lightfirst") diff --git a/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png b/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png new file mode 100644 index 0000000..70b1cd3 Binary files /dev/null and b/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png differ diff --git a/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png b/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png new file mode 100644 index 0000000..ea7368e Binary files /dev/null and b/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png differ diff --git a/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_dark.png b/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_dark.png deleted file mode 100644 index e88de7d..0000000 Binary files a/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_dark.png and /dev/null differ -- cgit v1.2.3