From 48dc7b4c929c0596bc710bebafc4ca53cacb1748 Mon Sep 17 00:00:00 2001 From: acmgit Date: Tue, 2 Aug 2016 20:12:31 +0200 Subject: Named Parameter added, Default-Values for Parameter inserted. --- init.lua | 46 ++++++++++++++++++++++++++++------- nodes.lua | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 110 insertions(+), 18 deletions(-) diff --git a/init.lua b/init.lua index 76f466f..b05303b 100644 --- a/init.lua +++ b/init.lua @@ -2,16 +2,46 @@ dofile(minetest.get_modpath("billboard") .. "/nodes.lua") for i,n in ipairs(bb_boardlist) do + -- No Title there? + if n.title == nil then + n.title = "Billboard ".. n.item1 .. "_" .. n.item2 .. "_" .. n.item3 + end + + -- For Recipe: Item isn't given? + if n.item1 == nil then + n.item1 = "sign_wall_wood" + end + if n.item2 == nil then + n.item2 = "white" + end + if n.item3 == nil then + n.item3 = "white" + end + + -- scale isn't given or 0 (invalid)? + if n.scale == nil or n.scale == 0 then + n.scale = 1 + end + -- scale has a negative value? + if n.scale < 0 then + n.scale = n.scale * -1 + end + + -- no Imagetyp is given? + if n.imgtyp == nil then + n.imgtyp = "png" + end + -- Register the Node - minetest.register_node("billboard:bb_".. n[1].."_"..n[2].."_"..n[3], { - description = "Billboard " ..n[1].."_"..n[2].."_"..n[3], + minetest.register_node("billboard:bb_".. n.item1 .."_"..n.item2 .."_"..n.item3, { + description = n.title, drawtype = "signlike", - visual_scale = n[4], + visual_scale = n.scale, tiles = { - "bb_"..n[1].."_"..n[2].."_"..n[3].."."..n[5] + "bb_"..n.item1.."_"..n.item2.."_"..n.item3.."."..n.imgtyp }, - inventory_image = "bb_"..n[1].."_"..n[2].."_"..n[3].."."..n[5], - wield_image = "bb_"..n[1].."_"..n[2].."_"..n[3].."."..n[5], + inventory_image = "bb_"..n.item1.."_"..n.item2.."_"..n.item3.."."..n.imgtyp, + wield_image = "bb_"..n.item1.."_"..n.item2.."_"..n.item3.."."..n.imgtyp, paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -27,10 +57,10 @@ for i,n in ipairs(bb_boardlist) do -- Register the Recipe for the Node minetest.register_craft({ - output = "billboard:bb_"..n[1].."_"..n[2].."_"..n[3], + output = "billboard:bb_"..n.item1.."_"..n.item2.."_"..n.item3, recipe = { {"group:stick", "group:stick", "group:stick"}, - {"default:"..n[1], "wool:"..n[2], "wool:"..n[3]}, + {"default:"..n.item1, "wool:"..n.item2, "wool:"..n.item3}, {"group:stick", "group:stick", "group:stick"} } }) diff --git a/nodes.lua b/nodes.lua index c191a69..615e2bc 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1,11 +1,73 @@ -bb_boardlist = { +bb_boardlist = + { +--[[ + + Description of an Entry: + + { + title = Name for the Billboard, default = bb_item1_item2_item3 + + Recipe to craft: + item1 = First Item for the recipe, default = sign_wall_wood + item2 = .. , default = white + item3 = .. , default = white + + Size of the Billboard in Blocks + scale = number , default = 0 + + Typ of the taken Image (must be in textures) + imgtyp = "Typ" , default = "png" + } - -- { default:, wool:, wool:, visual_scale, Imagetyp } - { "sign_wall_wood", "white", "white", 3.0, "jpg" }, - { "sign_wall_wood", "yellow", "yellow", 3.0, "jpg" }, - { "sign_wall_wood", "black", "yellow", 3.5, "jpg" }, - { "sign_wall_wood", "green", "blue", 3.0, "png" }, - { "sign_wall_wood", "blue", "yellow", 2.0, "jpg" }, - { "paper", "black", "orange", 2.5, "jpg" }, - { "paper", "green", "green", 2.0, "png" } -} +--]] + + { title = "Aikido Billboard", + item1 = "sign_wall_wood", + item2 = "white", + item3 = "white", + scale = 3.0, + imgtyp = "jpg" }, + + { title = "Detergen Billboard", + item1 = "sign_wall_wood", + item2 = "yellow", + item3 = "yellow", + scale = 3.0, + imgtyp = "jpg" }, + + { title = "Mesedrink Billboard", + item1 = "sign_wall_wood", + item2 = "black", + item3 = "yellow", + scale = 3.5, + imgtyp = "jpg" }, + + { title = "Meseforte Billboard", + item1 = "sign_wall_wood", + item2 = "green", + item3 = "blue", + scale = 3.0, + imgtyp = "png" }, + + { title = "Mesewave Billboard", + item1 = "sign_wall_wood", + item2 = "blue", + item3 = "yellow", + scale = 2.0, + imgtyp = "jpg" }, + + { title = "Newspaper Billboard", + item1 = "paper", + item2 = "black", + item3 = "orange", + scale = 2.5, + imgtyp = "jpg" }, + + { title = "Army Billboard", + item1 = "paper", + item2 = "green", + item3 = "green", + scale = 2.0, + imgtyp = "png" } + + } -- cgit v1.2.3