From bcd898146c00daa79b8bc99ff43b2dfdc5c192cc Mon Sep 17 00:00:00 2001 From: JPG Date: Fri, 30 Dec 2016 15:04:57 +0100 Subject: [PATCH] Fix some luackeck errors --- .luacheckrc | 1 + src/chess.lua | 16 ++++++++-------- src/enchanting.lua | 12 ++++++------ src/mailbox.lua | 14 +++++++------- src/nodes.lua | 40 ++++++++++++++++++++-------------------- 5 files changed, 42 insertions(+), 41 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index ea47ea3..3534e85 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -6,4 +6,5 @@ read_globals = { "vector", "ItemStack", "default", "stairs", "doors", "xpanes", + "xdecor", "xbg", } diff --git a/src/chess.lua b/src/chess.lua index 6de09cc..017b1b1 100644 --- a/src/chess.lua +++ b/src/chess.lua @@ -15,7 +15,7 @@ end function realchess.init(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - + local formspec = [[ size[8,8.6;] bgcolor[#080808BB;true] background[0,0;8,8;chess_bg.png] @@ -101,7 +101,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player if playerWhite ~= "" and playerWhite ~= playerName then minetest.chat_send_player(playerName, "Someone else plays white pieces!") return 0 - end + end if lastMove ~= "" and lastMove ~= "black" then minetest.chat_send_player(playerName, "It's not your turn, wait for your opponent to play.") return 0 @@ -361,7 +361,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player return 0 end end - end + end elseif from_x < to_x then if from_y == to_y then -- goes right @@ -387,7 +387,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player return 0 end end - end + end else if from_y == to_y then -- goes left @@ -413,14 +413,14 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player return 0 end end - end + end end elseif pieceFrom:sub(11,14) == "king" then local dx = from_x - to_x local dy = from_y - to_y local check = true - + if thisMove == "white" then if from_y == 7 and to_y == 7 then if to_x == 1 then @@ -492,12 +492,12 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player if dy < 0 then dy = -dy end if dx > 1 or dy > 1 then return 0 end end - + if thisMove == "white" then meta:set_int("castlingWhiteL", 0) meta:set_int("castlingWhiteR", 0) elseif thisMove == "black" then - meta:set_int("castlingBlackL", 0) + meta:set_int("castlingBlackL", 0) meta:set_int("castlingBlackR", 0) end end diff --git a/src/enchanting.lua b/src/enchanting.lua index 5d1d44a..27bb1fd 100644 --- a/src/enchanting.lua +++ b/src/enchanting.lua @@ -49,12 +49,12 @@ function enchanting:get_tooltip(enchant, orig_caps, fleshy) end local enchant_buttons = { - [[ image_button[3.9,0.85;4,0.92;bg_btn.png;fast;Efficiency] - image_button[3.9,1.77;4,1.12;bg_btn.png;durable;Durability] ]], - "image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength]", - "image_button[3.9,2.9;4,0.92;bg_btn.png;sharp;Sharpness]", - [[ image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength] - image_button[3.9,1.77;4,1.12;bg_btn.png;speed;Speed] ]] + [[ image_button[3.9,0.85;4,0.92;bg_btn.png;fast;Efficiency] + image_button[3.9,1.77;4,1.12;bg_btn.png;durable;Durability] ]], + "image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength]", + "image_button[3.9,2.9;4,0.92;bg_btn.png;sharp;Sharpness]", + [[ image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength] + image_button[3.9,1.77;4,1.12;bg_btn.png;speed;Speed] ]] } function enchanting.formspec(pos, num) diff --git a/src/mailbox.lua b/src/mailbox.lua index c1b330b..c7d34a3 100644 --- a/src/mailbox.lua +++ b/src/mailbox.lua @@ -62,13 +62,13 @@ function mailbox:formspec(pos, owner, is_owner) "listring[nodemeta:"..spos..";mailbox]".. xbg..default.get_hotbar_bg(0.75,5.25) end - return [[ size[8,5] - list[current_player;main;0,1.25;8,4;] ]].. - "label[0,0;Send your goods to\n".. - (minetest.colorize and - minetest.colorize("#FFFF00", owner) or owner).."]".. - "list[nodemeta:"..spos..";drop;3.5,0;1,1;]".. - xbg..default.get_hotbar_bg(0,1.25) + return [[ size[8,5] + list[current_player;main;0,1.25;8,4;] ]].. + "label[0,0;Send your goods to\n".. + (minetest.colorize and + minetest.colorize("#FFFF00", owner) or owner).."]".. + "list[nodemeta:"..spos..";drop;3.5,0;1,1;]".. + xbg..default.get_hotbar_bg(0,1.25) end function mailbox.dig(pos, player) diff --git a/src/nodes.lua b/src/nodes.lua index ba1a6b4..125eb84 100644 --- a/src/nodes.lua +++ b/src/nodes.lua @@ -1,6 +1,6 @@ screwdriver = screwdriver or {} -function xdecor.register_pane(name, desc, def) +local function register_pane(name, desc, def) xpanes.register_pane(name, { description = desc, tiles = {"xdecor_"..name..".png"}, @@ -15,21 +15,21 @@ function xdecor.register_pane(name, desc, def) }) end -xdecor.register_pane("bamboo_frame", "Bamboo Frame", { +register_pane("bamboo_frame", "Bamboo Frame", { groups = {choppy=3, oddly_breakable_by_hand=2, pane=1, flammable=2}, recipe = {{"default:papyrus", "default:papyrus", "default:papyrus"}, {"default:papyrus", "farming:cotton", "default:papyrus"}, {"default:papyrus", "default:papyrus", "default:papyrus"}} }) -xdecor.register_pane("chainlink", "Chainlink", { +register_pane("chainlink", "Chainlink", { groups = {cracky=3, oddly_breakable_by_hand=2, pane=1}, recipe = {{"default:steel_ingot", "", "default:steel_ingot"}, {"", "default:steel_ingot", ""}, {"default:steel_ingot", "", "default:steel_ingot"}} }) -xdecor.register_pane("rusty_bar", "Rusty Iron Bars", { +register_pane("rusty_bar", "Rusty Iron Bars", { sounds = default.node_sound_stone_defaults(), groups = {cracky=2, pane=1}, recipe = {{"", "default:dirt", ""}, @@ -37,7 +37,7 @@ xdecor.register_pane("rusty_bar", "Rusty Iron Bars", { {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}} }) -xdecor.register_pane("wood_frame", "Wood Frame", { +register_pane("wood_frame", "Wood Frame", { sounds = default.node_sound_wood_defaults(), groups = {choppy=2, pane=1, flammable=2}, recipe = {{"group:wood", "group:stick", "group:wood"}, @@ -65,7 +65,7 @@ xdecor.register("barrel", { sounds = default.node_sound_wood_defaults() }) -function xdecor.register_storage(name, desc, def) +local function register_storage(name, desc, def) xdecor.register(name, { description = desc, inventory = {size=def.inv_size or 24}, @@ -79,14 +79,14 @@ function xdecor.register_storage(name, desc, def) }) end -xdecor.register_storage("cabinet", "Wooden Cabinet", { +register_storage("cabinet", "Wooden Cabinet", { on_rotate = screwdriver.rotate_simple, tiles = {"xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", "xdecor_cabinet_front.png"} }) -xdecor.register_storage("cabinet_half", "Half Wooden Cabinet", { +register_storage("cabinet_half", "Half Wooden Cabinet", { inv_size = 8, node_box = xdecor.nodebox.slab_y(0.5, 0.5), on_rotate = screwdriver.rotate_simple, @@ -95,12 +95,12 @@ xdecor.register_storage("cabinet_half", "Half Wooden Cabinet", { "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_front.png"} }) -xdecor.register_storage("empty_shelf", "Empty Shelf", { +register_storage("empty_shelf", "Empty Shelf", { on_rotate = screwdriver.rotate_simple, tiles = {"default_wood.png", "default_wood.png^xdecor_empty_shelf.png"} }) -xdecor.register_storage("multishelf", "Multi Shelf", { +register_storage("multishelf", "Multi Shelf", { on_rotate = screwdriver.rotate_simple, tiles = {"default_wood.png", "default_wood.png^xdecor_multishelf.png"}, }) @@ -399,7 +399,7 @@ xdecor.register("stonepath", { selection_box = xdecor.nodebox.slab_y(0.05) }) -function xdecor.register_hard_node(name, desc, def) +local function register_hard_node(name, desc, def) xdecor.register(name, { description = desc, tiles = {"xdecor_"..name..".png"}, @@ -408,18 +408,18 @@ function xdecor.register_hard_node(name, desc, def) }) end -xdecor.register_hard_node("cactusbrick", "Cactus Brick", {}) -xdecor.register_hard_node("coalstone_tile", "Coal Stone Tile", {}) -xdecor.register_hard_node("desertstone_tile", "Desert Stone Tile", {}) -xdecor.register_hard_node("hard_clay", "Hardened Clay", {}) -xdecor.register_hard_node("moonbrick", "Moon Brick", {}) -xdecor.register_hard_node("stone_tile", "Stone Tile", {}) -xdecor.register_hard_node("stone_rune", "Runestone", {}) -xdecor.register_hard_node("packed_ice", "Packed Ice", { +register_hard_node("cactusbrick", "Cactus Brick", {}) +register_hard_node("coalstone_tile", "Coal Stone Tile", {}) +register_hard_node("desertstone_tile", "Desert Stone Tile", {}) +register_hard_node("hard_clay", "Hardened Clay", {}) +register_hard_node("moonbrick", "Moon Brick", {}) +register_hard_node("stone_tile", "Stone Tile", {}) +register_hard_node("stone_rune", "Runestone", {}) +register_hard_node("packed_ice", "Packed Ice", { groups = {cracky=1, puts_out_fire=1}, sounds = default.node_sound_glass_defaults() }) -xdecor.register_hard_node("wood_tile", "Wooden Tile", { +register_hard_node("wood_tile", "Wooden Tile", { groups = {choppy=1, wood=1, flammable=2}, sounds = default.node_sound_wood_defaults() })