diff options
Diffstat (limited to 'homedecor')
| -rw-r--r-- | homedecor/bathroom_furniture.lua | 30 | ||||
| -rw-r--r-- | homedecor/doors_and_gates.lua | 27 | ||||
| -rw-r--r-- | homedecor/gastronomy.lua | 3 | ||||
| -rw-r--r-- | homedecor/lighting.lua | 37 | ||||
| -rw-r--r-- | homedecor/textures/homedecor_gate_half_door_fb.png | bin | 0 -> 2085 bytes | |||
| -rw-r--r-- | homedecor/textures/homedecor_gate_half_door_lr.png | bin | 0 -> 684 bytes | |||
| -rw-r--r-- | homedecor/textures/homedecor_gate_half_door_tb.png | bin | 0 -> 421 bytes | |||
| -rw-r--r-- | homedecor/textures/homedecor_gate_half_door_white_fb.png | bin | 0 -> 1080 bytes | |||
| -rw-r--r-- | homedecor/textures/homedecor_gate_half_door_white_lr.png | bin | 0 -> 384 bytes | |||
| -rw-r--r-- | homedecor/textures/homedecor_gate_half_door_white_tb.png | bin | 0 -> 310 bytes |
10 files changed, 80 insertions, 17 deletions
diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index 0e839fd..d7cd0c6 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -11,7 +11,8 @@ minetest.register_node("homedecor:bathroom_tiles_dark", { mesh = "homedecor_block_with_overlay.obj", paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "unifieddyes_palette_extended.png", + place_param2 = 240, groups = {cracky=3, ud_param2_colorable = 1}, sounds = default.node_sound_stone_defaults(), after_dig_node = unifieddyes.after_dig_node @@ -27,7 +28,8 @@ minetest.register_node("homedecor:bathroom_tiles_medium", { mesh = "homedecor_block_with_overlay.obj", paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "unifieddyes_palette_extended.png", + place_param2 = 240, groups = {cracky=3, ud_param2_colorable = 1}, sounds = default.node_sound_stone_defaults(), after_dig_node = unifieddyes.after_dig_node @@ -43,7 +45,8 @@ minetest.register_node("homedecor:bathroom_tiles_light", { mesh = "homedecor_block_with_overlay.obj", paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "unifieddyes_palette_extended.png", + place_param2 = 240, groups = {cracky=3, ud_param2_colorable = 1}, sounds = default.node_sound_stone_defaults(), after_dig_node = unifieddyes.after_dig_node @@ -156,10 +159,29 @@ minetest.register_lbm({ color = color.."_s50" end - local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) + local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended") minetest.set_node(pos, { name = newname, param2 = paletteidx }) local meta = minetest.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) + meta:set_string("palette", "ext") + end +}) + +minetest.register_lbm({ + name = "homedecor:recolor_bathroom_tiles", + label = "Convert bathroom tiles to use UD extended palette", + run_at_every_load = false, + nodenames = { + "homedecor:bathroom_tiles_light", + "homedecor:bathroom_tiles_medium", + "homedecor:bathroom_tiles_dark", + }, + action = function(pos, node) + local meta = minetest.get_meta(pos) + if meta:get_string("palette") ~= "ext" then + minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] }) + meta:set_string("palette", "ext") + end end }) diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index 81d8583..f29ea24 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -293,10 +293,12 @@ end -- Gates local gate_list = { - { "picket", S("Unpainted Picket Fence Gate") }, - { "picket_white", S("White Picket Fence Gate") }, - { "barbed_wire", S("Barbed Wire Fence Gate") }, - { "chainlink", S("Chainlink Fence Gate") }, + { "picket", S("Unpainted Picket Fence Gate") }, + { "picket_white", S("White Picket Fence Gate") }, + { "barbed_wire", S("Barbed Wire Fence Gate") }, + { "chainlink", S("Chainlink Fence Gate") }, + { "half_door", S("\"Half\" Door") }, + { "half_door_white", S("\"Half\" Door (white)") } } local gate_models_closed = { @@ -315,7 +317,12 @@ local gate_models_closed = { { -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece { -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }, -- the chainlink itself - { -8/16, -3/16, 6/16, -6/16, 3/16, 8/16 }} -- the lump representing the lock + { -8/16, -3/16, 6/16, -6/16, 3/16, 8/16 }}, -- the lump representing the lock + + {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, -- the whole door :P + + {{ -8/16, -8/16, 6/16, 8/16, 8/16, 8/16 }}, -- the whole door :P + } local gate_models_open = { @@ -334,7 +341,11 @@ local gate_models_open = { { 13/32, 7/16, -8/16, 15/32, 8/16, 8/16 }, -- top piece { 13/32, -8/16, -8/16, 15/32, -7/16, 8/16 }, -- bottom piece { 7/16, -8/16, -8/16, 7/16, 8/16, 8/16 }, -- the chainlink itself - { 6/16, -3/16, -8/16, 8/16, 3/16, -6/16 }} -- the lump representing the lock + { 6/16, -3/16, -8/16, 8/16, 3/16, -6/16 }}, -- the lump representing the lock + + {{ 6/16, -8/16, -8/16, 8/16, 8/16, 8/16 }}, -- the whole door :P + + {{ 6/16, -8/16, -8/16, 8/16, 8/16, 8/16 }}, -- the whole door :P } for i, g in ipairs(gate_list) do @@ -409,8 +420,8 @@ for i, g in ipairs(gate_list) do def.selection_box.fixed = { 0.4, -0.5, -0.5, 0.5, 0.5, 0.5 } def.node_box.fixed = gate_models_open[i] def.tiles = { - tiles[1], - tiles[2], + tiles[1].."^[transformR90", + tiles[2].."^[transformR270", tiles[6], tiles[5], tiles[4], diff --git a/homedecor/gastronomy.lua b/homedecor/gastronomy.lua index 911d151..51f6526 100644 --- a/homedecor/gastronomy.lua +++ b/homedecor/gastronomy.lua @@ -191,8 +191,7 @@ homedecor.register("beer_mug", { z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] } minetest.add_item(pos_fwd, "vessels:drinking_glass 1") end - minetest.item_eat(2) - itemstack:take_item() + minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) return itemstack end end diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 369c5bd..4199558 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -414,7 +414,8 @@ local function reg_lamp(suffix, nxt, light, brightness) inventory_image = "homedecor_table_lamp_foot_inv.png^homedecor_table_lamp_top_inv.png", paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "unifieddyes_palette_extended.png", + place_param2 = 240, walkable = false, light_source = light, selection_box = tlamp_cbox, @@ -442,7 +443,8 @@ local function reg_lamp(suffix, nxt, light, brightness) inventory_image = "homedecor_standing_lamp_foot_inv.png^homedecor_standing_lamp_top_inv.png", paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "unifieddyes_palette_extended.png", + place_param2 = 240, walkable = false, light_source = light, groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1, @@ -610,7 +612,7 @@ minetest.register_lbm({ color = "white" end - local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, false) + local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended") local old_fdir local new_node = newname @@ -640,6 +642,10 @@ minetest.register_lbm({ param2 = paletteidx end + if string.find(name, "table_lamp") or string.find(name, "standing_lamp") then + meta:set_string("palette", "ext") + end + minetest.set_node(pos, { name = new_node, param2 = param2 }) local meta = minetest.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) @@ -691,3 +697,28 @@ minetest.register_lbm({ meta:set_string("dye", "unifieddyes:"..color) end }) + +minetest.register_lbm({ + name = "homedecor:recolor_lighting", + label = "Convert some kinds of lights to use UD extended palette", + run_at_every_load = false, + nodenames = { + "homedecor:table_lamp_off", + "homedecor:table_lamp_low", + "homedecor:table_lamp_med", + "homedecor:table_lamp_hi", + "homedecor:table_lamp_max", + "homedecor:standing_lamp_off", + "homedecor:standing_lamp_low", + "homedecor:standing_lamp_med", + "homedecor:standing_lamp_hi", + "homedecor:standing_lamp_max", + }, + action = function(pos, node) + local meta = minetest.get_meta(pos) + if meta:get_string("palette") ~= "ext" then + minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] }) + meta:set_string("palette", "ext") + end + end +}) diff --git a/homedecor/textures/homedecor_gate_half_door_fb.png b/homedecor/textures/homedecor_gate_half_door_fb.png Binary files differnew file mode 100644 index 0000000..c9be70a --- /dev/null +++ b/homedecor/textures/homedecor_gate_half_door_fb.png diff --git a/homedecor/textures/homedecor_gate_half_door_lr.png b/homedecor/textures/homedecor_gate_half_door_lr.png Binary files differnew file mode 100644 index 0000000..48329d8 --- /dev/null +++ b/homedecor/textures/homedecor_gate_half_door_lr.png diff --git a/homedecor/textures/homedecor_gate_half_door_tb.png b/homedecor/textures/homedecor_gate_half_door_tb.png Binary files differnew file mode 100644 index 0000000..03b360f --- /dev/null +++ b/homedecor/textures/homedecor_gate_half_door_tb.png diff --git a/homedecor/textures/homedecor_gate_half_door_white_fb.png b/homedecor/textures/homedecor_gate_half_door_white_fb.png Binary files differnew file mode 100644 index 0000000..ca5c5d1 --- /dev/null +++ b/homedecor/textures/homedecor_gate_half_door_white_fb.png diff --git a/homedecor/textures/homedecor_gate_half_door_white_lr.png b/homedecor/textures/homedecor_gate_half_door_white_lr.png Binary files differnew file mode 100644 index 0000000..038d20d --- /dev/null +++ b/homedecor/textures/homedecor_gate_half_door_white_lr.png diff --git a/homedecor/textures/homedecor_gate_half_door_white_tb.png b/homedecor/textures/homedecor_gate_half_door_white_tb.png Binary files differnew file mode 100644 index 0000000..2d592e7 --- /dev/null +++ b/homedecor/textures/homedecor_gate_half_door_white_tb.png |
