diff --git a/README.md b/README.md index 1dbf83e..f8ec35c 100644 --- a/README.md +++ b/README.md @@ -24,5 +24,6 @@ Changelog: - 0.9 - Tweak item drops, add replacements to schematics, tidy wishing well code - 1.0 - Added ability for custom lucky blocks to use their own block list - 1.1 - Spawning mobs can now select randomly from a table or single string +- 1.2 - Code tidy and fixed wishing well replacements Lucky Blocks: 259 (depending on mods enabled) diff --git a/init.lua b/init.lua index bebbe90..849ea42 100644 --- a/init.lua +++ b/init.lua @@ -641,7 +641,7 @@ end -- lucky block itself -minetest.register_node('lucky_block:lucky_block', { +minetest.register_node("lucky_block:lucky_block", { description = S("Lucky Block"), tiles = {{ name = "lucky_block_animated.png", @@ -680,7 +680,7 @@ minetest.register_craft({ -- super lucky block -minetest.register_node('lucky_block:super_lucky_block', { +minetest.register_node("lucky_block:super_lucky_block", { description = S("Super Lucky Block (use pick)"), tiles = {{ name = "lucky_block_super_animated.png", diff --git a/schematics/lb_wishing_well.mts b/schematics/lb_wishing_well.mts deleted file mode 100644 index e646bbe..0000000 Binary files a/schematics/lb_wishing_well.mts and /dev/null differ diff --git a/schems.lua b/schems.lua index d55628b..b969544 100644 --- a/schems.lua +++ b/schems.lua @@ -152,6 +152,38 @@ local obsidian_trap = { }, } +local stb = {name = "default:steelblock", param1 = 255} +local sbr = {name = "default:stonebrick", param1 = 255} +local fwd = {name = "default:fence_wood", param1 = 255} +local slb = {name = "stairs:slab_stonebrick", param1 = 255} +local wbl = {name = "lucky_block:well_block", param1 = 255} +local gla = {name = "default:glass", param1 = 255} + +local wishing_well = { + + size = {x = 3, y = 5, z = 3}, + + data = { + stb,stb,stb, + sbr,sbr,sbr, + fwd,air,fwd, + fwd,air,fwd, + slb,slb,slb, + + stb,wbl,stb, + sbr,wat,sbr, + air,air,air, + air,air,air, + slb,gla,slb, + + stb,stb,stb, + sbr,sbr,sbr, + fwd,air,fwd, + fwd,air,fwd, + slb,slb,slb, + }, +} + -- add schematics to list lucky_block:add_schematics({ @@ -162,6 +194,7 @@ lucky_block:add_schematics({ {"instafarm", insta_farm, {x = 2, y = 2, z = 1}}, {"firetrap", fire_trap, {x = 1, y = 0, z = 1}}, {"obsidiantrap", obsidian_trap, {x = 1, y = 0, z = 1}}, + {"wishingwell", wishing_well, {x = 1, y = 1, z = 1}}, }) -- wishing well @@ -175,11 +208,6 @@ minetest.register_node("lucky_block:well_block", { drop = {}, }) -local path = minetest.get_modpath("lucky_block") .. "/schematics/" - -lucky_block:add_schematics({ - {"wishingwell", path .. "lb_wishing_well.mts", {x = 1, y = 1, z = 1}}, -}) -- Global list containing well blocks that can be dropped lucky_block.wellblocks = {