From dfcf64c1d07f4006045af37b0b01dbfc82dbb1d1 Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Sat, 26 Aug 2023 10:57:05 +0200 Subject: [PATCH] Chainsaw: new setting to disable safe cutting --- technic/machines/register/cables.lua | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua index 63ee851..70da6d6 100644 --- a/technic/machines/register/cables.lua +++ b/technic/machines/register/cables.lua @@ -11,6 +11,13 @@ return cable_tier[name] end +function technic.register_cable_tier(name, tier) + assert(technic.machines[tier], "Tier does not exist") + assert(type(name) == "string", "Invalid node name") + + cable_tier[name] = tier +end + local function check_connections(pos) -- Build a table of all machines local machines = {} @@ -60,27 +67,27 @@ local tier = network.tier -- Actually add it to the (cached) network - -- This is similar to check_node_subp + -- !! IMPORTANT: ../switching_station.lua -> check_node_subp() must be kept in sync technic.cables[minetest.hash_node_position(pos)] = network_id pos.visited = 1 - if technic.is_tier_cable(name, tier) then + if technic.is_tier_cable(node.name, tier) then + -- Found a cable table.insert(network.all_nodes,pos) elseif technic.machines[tier][node.name] then - meta:set_string(tier.."_network",minetest.pos_to_string(sw_pos)) - if technic.machines[tier][node.name] == technic.producer then - table.insert(network.PR_nodes,pos) - elseif technic.machines[tier][node.name] == technic.receiver then - table.insert(network.RE_nodes,pos) - elseif technic.machines[tier][node.name] == technic.producer_receiver then - table.insert(network.PR_nodes,pos) - table.insert(network.RE_nodes,pos) - elseif technic.machines[tier][node.name] == "SPECIAL" and - (pos.x ~= sw_pos.x or pos.y ~= sw_pos.y or pos.z ~= sw_pos.z) and - from_below then - table.insert(network.SP_nodes,pos) - elseif technic.machines[tier][node.name] == technic.battery then - table.insert(network.BA_nodes,pos) + -- Found a machine + local eu_type = technic.machines[tier][node.name] + meta:set_string(tier.."_network", string.format("%.20g", network_id)) + if eu_type == technic.producer then + table.insert(network.PR_nodes, pos) + elseif eu_type == technic.receiver then + table.insert(network.RE_nodes, pos) + elseif eu_type == technic.producer_receiver then + table.insert(network.PR_nodes, pos) + table.insert(network.RE_nodes, pos) + elseif eu_type == technic.battery then + table.insert(network.BA_nodes, pos) end + -- Note: SPECIAL (i.e. switching station) is not traversed! end elseif dead_end and not placed then -- Dead end removed, remove it from the network @@ -215,7 +222,7 @@ if i == 1 then def.on_place = function(itemstack, placer, pointed_thing) local pointed_thing_diff = vector.subtract(pointed_thing.above, pointed_thing.under) - local num + local num = 1 local changed for k, v in pairs(pointed_thing_diff) do if v ~= 0 then @@ -225,7 +232,7 @@ end end local crtl = placer:get_player_control() - if (crtl.aux1 or crtl.sneak) and not (crtl.aux1 and crtl.sneak) then + if (crtl.aux1 or crtl.sneak) and not (crtl.aux1 and crtl.sneak) and changed then local fine_pointed = minetest.pointed_thing_to_face_pos(placer, pointed_thing) fine_pointed = vector.subtract(fine_pointed, pointed_thing.above) fine_pointed[changed] = nil -- Gitblit v1.8.0