From e90b28895cc28daf1a2e4fb772bd191400cf9e62 Mon Sep 17 00:00:00 2001 From: fgrosswig <falk@grosswig.de> Date: Mon, 06 Jan 2020 21:50:15 +0100 Subject: [PATCH] battery_box.lua: Make "srcstack" local (#525) --- technic_cnc/cnc.lua | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/technic_cnc/cnc.lua b/technic_cnc/cnc.lua index bc277d1..0e23f5a 100644 --- a/technic_cnc/cnc.lua +++ b/technic_cnc/cnc.lua @@ -13,7 +13,7 @@ local allow_metadata_inventory_take local allow_metadata_inventory_move local can_dig -local voltage = "" +local desc_tr = S("CNC Machine") if technic_cnc.use_technic then minetest.register_craft({ @@ -29,8 +29,7 @@ allow_metadata_inventory_take = technic.machine_inventory_take allow_metadata_inventory_move = technic.machine_inventory_move can_dig = technic.machine_can_dig - voltage = "LV " - + desc_tr = S("%s CNC Machine"):format("LV") else minetest.register_craft({ output = 'technic:cnc', @@ -93,7 +92,7 @@ twocurvededge = 1, } local twosize_products = { - element_straight = 4, + element_straight = 2, element_end = 2, element_cross = 1, element_t = 1, @@ -143,30 +142,32 @@ "listring[current_name;src]".. "listring[current_player;main]" -local size = 1; - -- The form handler is declared here because we need it in both the inactive and active modes -- in order to be able to change programs wile it is running. local function form_handler(pos, formname, fields, sender) + local meta = minetest.get_meta(pos) + -- REGISTER MILLING PROGRAMS AND OUTPUTS: ------------------------------------------ -- Program for half/full size if fields["full"] then - size = 1 + meta:set_int("size", 1) return end if fields["half"] then - size = 2 + meta:set_int("size", 2) return end -- Resolve the node name and the number of items to make - local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local inputstack = inv:get_stack("src", 1) local inputname = inputstack:get_name() local multiplier = 0 + local size = meta:get_int("size") + if size < 1 then size = 1 end + for k, _ in pairs(fields) do -- Set a multipier for the half/full size capable blocks if twosize_products[k] ~= nil then @@ -212,7 +213,7 @@ local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local eu_input = meta:get_int("LV_EU_input") - local machine_name = S("%sCNC Machine"):format(voltage) + local machine_name = desc_tr local machine_node = "technic:cnc" local demand = 450 @@ -247,7 +248,7 @@ -- The actual block inactive state minetest.register_node(":technic:cnc", { - description = S("%sCNC Machine"):format(voltage), + description = desc_tr, tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"}, groups = {cracky=2, technic_machine=1, technic_lv=1}, @@ -256,7 +257,7 @@ legacy_facedir_simple = true, on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("%sCNC Machine"):format(voltage)) + meta:set_string("infotext", desc_tr) meta:set_float("technic_power_machine", 1) meta:set_string("formspec", cnc_formspec) local inv = meta:get_inventory() @@ -275,7 +276,7 @@ if technic_cnc.use_technic then minetest.register_node(":technic:cnc_active", { - description = S("%sCNC Machine"):format(voltage), + description = desc_tr, tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1}, -- Gitblit v1.8.0