From b44e6e89bef277f6e05d761d30f70aa990f313a6 Mon Sep 17 00:00:00 2001 From: numzero Date: Thu, 6 Aug 2020 15:46:58 +0300 Subject: [PATCH] =?UTF-8?q?Small=20fixes=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mesecons_extrawires/doublecorner.lua | 91 ++++++++++++++-------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/mesecons_extrawires/doublecorner.lua b/mesecons_extrawires/doublecorner.lua index 96155ca..73f78eb 100644 --- a/mesecons_extrawires/doublecorner.lua +++ b/mesecons_extrawires/doublecorner.lua @@ -1,66 +1,69 @@ -local screwdriver_exists = minetest.global_exists("screwdriver") +local rotate +if minetest.global_exists("screwdriver") then rotate = screwdriver.rotate_simple end local doublecorner_selectionbox = { - type = "fixed", - fixed = { -16/32, -16/32, -16/32, 16/32, -12/32, 16/32 }, + type = "fixed", + fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, } local doublecorner_rules = { - {--first wire - {x=1,y=0,z=0}, - {x=0,y=0,z=1}, + { + { x = 1, y = 0, z = 0 }, + { x = 0, y = 0, z = 1 }, }, - {--second wire - {x=-1,y=0,z=0}, - {x=0,y=0,z=-1}, + { + { x = -1, y = 0, z = 0 }, + { x = 0, y = 0, z = -1 }, }, } local doublecorner_states = { - "mesecons_extrawires:doublecorner_off", + "mesecons_extrawires:doublecorner_00", "mesecons_extrawires:doublecorner_01", "mesecons_extrawires:doublecorner_10", - "mesecons_extrawires:doublecorner_on", + "mesecons_extrawires:doublecorner_11", } -local wire1_states = {"off", "off", "on", "on"} -local wire2_states = {"off", "on", "off", "on"} +local wire1_states = { "off", "off", "on", "on" } +local wire2_states = { "off", "on", "off", "on" } for k, state in ipairs(doublecorner_states) do - w1 = wire1_states[k] - w2 = wire2_states[k] -minetest.register_node(state, { - drawtype = "mesh", - mesh = "mesecons_extrawires_doublecorner.obj", - description = "Insulated Mesecon Double Corner", - tiles = { - { name = "jeija_insulated_wire_sides_" .. w1 .. ".png", backface_culling = true }, - { name = "jeija_insulated_wire_ends_" .. w1 .. ".png", backface_culling = true }, - { name = "jeija_insulated_wire_sides_" .. w2 .. ".png", backface_culling = true }, - { name = "jeija_insulated_wire_ends_" .. w2 .. ".png", backface_culling = true }, - }, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = false, - walkable = false, - sunlight_propagates = true, - selection_box = doublecorner_selectionbox, - groups = {dig_immediate = 3}, - drop = "mesecons_extrawires:doublecorner_off", - sounds = default.node_sound_defaults(), - mesecons = { - conductor = { - states = doublecorner_states, - rules = doublecorner_rules, + local w1 = wire1_states[k] + local w2 = wire2_states[k] + local groups = { dig_immediate = 3 } + if k ~= 1 then groups.not_in_creative_inventory = 1 end + minetest.register_node(state, { + drawtype = "mesh", + mesh = "mesecons_extrawires_doublecorner.obj", + description = "Insulated Mesecon Double Corner", + tiles = { + { name = "jeija_insulated_wire_sides_" .. w1 .. ".png", backface_culling = true }, + { name = "jeija_insulated_wire_ends_" .. w1 .. ".png", backface_culling = true }, + { name = "jeija_insulated_wire_sides_" .. w2 .. ".png", backface_culling = true }, + { name = "jeija_insulated_wire_ends_" .. w2 .. ".png", backface_culling = true }, }, - }, - on_blast = mesecon.on_blastnode, - on_rotate = screwdriver_exists and screwdriver.rotate_simple, -}) + paramtype = "light", + paramtype2 = "facedir", + is_ground_content = false, + walkable = false, + sunlight_propagates = true, + selection_box = doublecorner_selectionbox, + groups = groups, + drop = doublecorner_states[1], + sounds = default.node_sound_defaults(), + mesecons = { + conductor = { + states = doublecorner_states, + rules = doublecorner_rules, + }, + }, + on_blast = mesecon.on_blastnode, + on_rotate = rotate, + }) end minetest.register_craft({ type = "shapeless", - output = "mesecons_extrawires:doublecorner_off", + output = "mesecons_extrawires:doublecorner_00", recipe = { "mesecons_extrawires:corner_off", "mesecons_extrawires:corner_off", @@ -71,6 +74,6 @@ minetest.register_craft({ type = "shapeless", output = "mesecons_extrawires:corner_off 2", recipe = { - "mesecons_extrawires:doublecorner_off", + "mesecons_extrawires:doublecorner_00", }, })