diff options
Diffstat (limited to 'homedecor')
| -rw-r--r-- | homedecor/crafts.lua | 74 | ||||
| -rw-r--r-- | homedecor/depends.txt | 1 | ||||
| -rw-r--r-- | homedecor/lighting.lua | 23 |
3 files changed, 77 insertions, 21 deletions
diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index f9edb53..72ccfd5 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -1207,21 +1207,60 @@ minetest.register_craft({ -- wood-lattice lamps -minetest.register_craft( { - output = "homedecor:lattice_lantern_large 2", - recipe = { - { "dye:black", "dye:yellow", "dye:black" }, - { "group:stick", "building_blocks:woodglass", "group:stick" }, - { "group:stick", "homedecor:power_crystal", "group:stick" } - }, -}) +if minetest.get_modpath("darkage") then + minetest.register_craft( { + output = "homedecor:lattice_lantern_small 8", + recipe = { + { "darkage:lamp" }, + }, + }) -minetest.register_craft( { - output = "homedecor:lattice_lantern_small 8", - recipe = { + minetest.register_craft( { + output = "darkage:lamp", + type = "shapeless", + recipe = { + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + }, + }) +else + minetest.register_craft( { + output = "homedecor:lattice_lantern_large 2", + recipe = { + { "dye:black", "dye:yellow", "dye:black" }, + { "group:stick", "building_blocks:woodglass", "group:stick" }, + { "group:stick", "homedecor:power_crystal", "group:stick" } + }, + }) + + minetest.register_craft( { + output = "homedecor:lattice_lantern_small 8", + recipe = { { "homedecor:lattice_lantern_large" }, - }, -}) + }, + }) + + minetest.register_craft( { + output = "homedecor:lattice_lantern_large", + type = "shapeless", + recipe = { + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + "homedecor:lattice_lantern_small", + }, + }) +end -- glowlights @@ -2170,6 +2209,15 @@ minetest.register_craft({ }) minetest.register_craft({ + output = "homedecor:welcome_mat_green 2", + recipe = { + { "", "dye:white", "" }, + { "dye:black", "dye:black", "dye:black" }, + { "wool:green", "wool:green", "wool:green" }, + }, +}) + +minetest.register_craft({ type = "shapeless", output = "homedecor:window_plain 8", recipe = { diff --git a/homedecor/depends.txt b/homedecor/depends.txt index 1c71e74..baaeb85 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -14,3 +14,4 @@ flowers? 3d_armor? skinsdb? mesecons? +darkage? diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 9055f23..ddd0e44 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -360,13 +360,20 @@ homedecor.register("ceiling_lantern", { walkable = false }) -homedecor.register("lattice_lantern_large", { - description = S("Lattice lantern (large)"), - tiles = { 'homedecor_lattice_lantern_large.png' }, - groups = { snappy = 3 }, - light_source = default.LIGHT_MAX, - sounds = default.node_sound_glass_defaults(), -}) +local sm_light = default.LIGHT_MAX-2 + +if minetest.get_modpath("darkage") then + minetest.register_alias("homedecor:lattice_lantern_large", "darkage:lamp") + sm_light = default.LIGHT_MAX-5 +else + homedecor.register("lattice_lantern_large", { + description = S("Lattice lantern (large)"), + tiles = { 'homedecor_lattice_lantern_large.png' }, + groups = { snappy = 3 }, + light_source = default.LIGHT_MAX, + sounds = default.node_sound_glass_defaults(), + }) +end homedecor.register("lattice_lantern_small", { description = S("Lattice lantern (small)"), @@ -384,7 +391,7 @@ homedecor.register("lattice_lantern_small", { fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } }, groups = { snappy = 3 }, - light_source = default.LIGHT_MAX-1, + light_source = sm_light, sounds = default.node_sound_glass_defaults(), on_place = minetest.rotate_node }) |