diff --git a/api.txt b/api.txt index 7bf7743..e70d2ee 100644 --- a/api.txt +++ b/api.txt @@ -339,14 +339,14 @@ e.g. Punch player and deal 5 damage points (function first then line to add l.block) -local function punchy(pos, player) +local function punchy(pos, player, def) player:punch(player, 1.0, { full_punch_interval = 1.0, - damage_groups = {fleshy = 5} + damage_groups = {fleshy = def.damage} }, nil) end - {"cus", punchy} + {"cus", punchy, {damage = 5} } Final Words diff --git a/blocks.lua b/blocks.lua index 2bd80bd..eef0075 100644 --- a/blocks.lua +++ b/blocks.lua @@ -718,7 +718,7 @@ lucky_block:add_blocks({ end -- Bags mod -if minetest.get_modpath("bags") then +if minetest.get_modpath("bags") or minetest.get_modpath("sfinv_bags") then minetest.register_craftitem(":bags:spar", { description = "Spar Bag", inventory_image = "bags_spar.png", @@ -779,7 +779,7 @@ lucky_block:add_blocks({ -- Troll local green = minetest.get_color_escape_sequence("#1eff00") -local function fake_diamonds(pos, player) +local function fake_items(pos, player, def) for n = 1, 25 do @@ -794,7 +794,7 @@ local function fake_diamonds(pos, player) acceleration = {x = 0, y = -10, z = 0}, expirationtime = 4, maxsize = 4, - texture = "default_diamond.png", + texture = def.tex, glow = 2, size = 5, collisiondetection = true, @@ -804,9 +804,11 @@ local function fake_diamonds(pos, player) end minetest.chat_send_player(player:get_player_name(), - green .. S("Wow! So many faux diamonds!")) + green .. S("Wow! So many faux " .. def.txt .. "!")) end lucky_block:add_blocks({ - {"cus", fake_diamonds}, + {"cus", fake_items, {tex = "default_diamond.png", txt = "diamonds"} }, + {"cus", fake_items, {tex = "default_gold_ingot.png", txt = "ingots"} }, + {"cus", fake_items, {tex = "default_mese_crystal.png", txt = "crystals"} }, }) diff --git a/init.lua b/init.lua index 72f5d57..aa3d9e6 100644 --- a/init.lua +++ b/init.lua @@ -589,7 +589,7 @@ function lucky_block:open(pos, digger, blocks_list) -- make sure it's really random math.randomseed(minetest.get_timeofday() + pos.x + pos.z - os.time()) - local luck = math.random(#blocks_list) ; --luck = 1 + local luck = math.random(#blocks_list) ; -- luck = 1 local action = blocks_list[luck][1] -- print ("luck ["..luck.." of "..#blocks_list.."]", action) @@ -648,8 +648,9 @@ function lucky_block:open(pos, digger, blocks_list) elseif action == "cus" then local func = blocks_list[luck][2] + local def = blocks_list[luck][3] - if func then func(pos, digger) end + if func then func(pos, digger, def) end end end