fix mergeconflicts (3aa09519) · Commits · Illuna-Minetest / homedecor_modpack

homedecor/bathroom_furniture.lua

+12 −12

Original line number	Diff line number	Diff line
		@@ -4,11 +4,11 @@ local S = homedecor_i18n.gettext
		minetest.register_node("homedecor:bathroom_tiles_dark", {
		description = S("Bathroom/kitchen tiles (dark)"),
		tiles = {
		{ name = "homedecor_bathroom_tiles_bg.png", color = 0xff606060 },
		"homedecor_bathroom_tiles_fg.png"
		"homedecor_bathroom_tiles_bg.png"
		},
		overlay_tiles = {
		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xff606060 },
		},
		drawtype = "mesh",
		mesh = "homedecor_block_with_overlay.obj",
		paramtype = "light",
		paramtype2 = "color",
		palette = "unifieddyes_palette_extended.png",
		@@ -23,11 +23,11 @@ minetest.register_node("homedecor:bathroom_tiles_dark", {
		minetest.register_node("homedecor:bathroom_tiles_medium", {
		description = S("Bathroom/kitchen tiles (medium)"),
		tiles = {
		{ name = "homedecor_bathroom_tiles_bg.png", color = 0xffc0c0c0 },
		"homedecor_bathroom_tiles_fg.png"
		"homedecor_bathroom_tiles_bg.png"
		},
		overlay_tiles = {
		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xffc0c0c0 },
		},
		drawtype = "mesh",
		mesh = "homedecor_block_with_overlay.obj",
		paramtype = "light",
		paramtype2 = "color",
		palette = "unifieddyes_palette_extended.png",
		@@ -42,11 +42,11 @@ minetest.register_node("homedecor:bathroom_tiles_medium", {
		minetest.register_node("homedecor:bathroom_tiles_light", {
		description = S("Bathroom/kitchen tiles (light)"),
		tiles = {
		{ name = "homedecor_bathroom_tiles_bg.png", color = 0xffffffff },
		"homedecor_bathroom_tiles_fg.png"
		"homedecor_bathroom_tiles_bg.png"
		},
		overlay_tiles = {
		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xffffffff },
		},
		drawtype = "mesh",
		mesh = "homedecor_block_with_overlay.obj",
		paramtype = "light",
		paramtype2 = "color",
		palette = "unifieddyes_palette_extended.png",

homedecor/books.lua

+147 −205

Original line number	Diff line number	Diff line

		local S = homedecor_i18n.gettext

		local function N_(x) return x end

		local bookcolors = {
		{ N_("red"), 0xffd26466 },
		{ N_("green"), 0xff62aa66 },
		{ N_("blue"), 0xff8686d7 },
		{ N_("violet"), 0xff9c65a7 },
		{ N_("grey"), 0xff757579 },
		{ N_("brown"), 0xff896958 }
		}

		local BOOK_FORMNAME = "homedecor:book_form"

		local player_current_book = { }

		for _, c in ipairs(bookcolors) do
		local color, hue = unpack(c)

		local function book_dig(pos, node, digger)
		if minetest.is_protected(pos, digger:get_player_name()) then return end
		local meta = minetest.get_meta(pos)
		@@ -15,7 +28,7 @@ local function book_dig(pos, node, digger)
		_recover = meta:get_string("_recover") or "",
		})
		local stack = ItemStack({
		name = "homedecor:book",
		name = "homedecor:book_"..color,
		metadata = data,
		})
		stack = digger:get_inventory():add_item("main", stack)
		@@ -25,27 +38,23 @@ local function book_dig(pos, node, digger)
		minetest.remove_node(pos)
		end

		local inv_img = "homedecor_book_inv.png^homedecor_book_trim_inv.png"

		homedecor.register("book", {
		description = S("Writable Book"),
		homedecor.register("book_"..color, {
		description = S("Writable Book (@1)", S(color)),
		mesh = "homedecor_book.obj",
		tiles = {
		"homedecor_book_cover.png",
		{ name = "homedecor_book_edges.png", color = 0xffffffff },
		{ name = "homedecor_book_cover_trim.png", color = 0xffffffff }
		{ name = "homedecor_book_cover.png", color = hue },
		{ name = "homedecor_book_edges.png", color = "white" }
		},
		overlay_tiles = {
		{ name = "homedecor_book_cover_trim.png", color = "white" },
		""
		},
		inventory_image = inv_img,
		wield_image = inv_img,
		groups = { snappy=3, oddly_breakable_by_hand=3, book=1, ud_param2_colorable = 1 },
		groups = { snappy=3, oddly_breakable_by_hand=3, book=1 },
		walkable = false,
		paramtype2 = "colorwallmounted",
		palette = "unifieddyes_palette_colorwallmounted.png",
		after_dig_node = unifieddyes.after_dig_node,
		stack_max = 1,
		on_punch = function(pos, node, puncher, pointed_thing)
		local fdir = node.param2
		minetest.swap_node(pos, { name = "homedecor:book_open", param2 = fdir })
		minetest.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir })
		end,
		on_place = function(itemstack, placer, pointed_thing)
		local plname = placer:get_player_name()
		@@ -61,7 +70,7 @@ homedecor.register("book", {
		if minetest.is_protected(pos, plname) then return itemstack end
		local fdir = minetest.dir_to_facedir(placer:get_look_dir())
		minetest.set_node(pos, {
		name = "homedecor:book",
		name = "homedecor:book_"..color,
		param2 = fdir,
		})
		local text = itemstack:get_metadata() or ""
		@@ -83,10 +92,8 @@ homedecor.register("book", {
		if not homedecor.expect_infinite_stacks then
		itemstack:take_item()
		end
		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
		return itemstack
		end,
		on_rotate = unifieddyes.fix_after_screwdriver_nsew,
		on_dig = book_dig,
		selection_box = {
		type = "fixed",
		@@ -94,21 +101,16 @@ homedecor.register("book", {
		}
		})

		homedecor.register("book_open", {
		homedecor.register("book_open_"..color, {
		mesh = "homedecor_book_open.obj",
		tiles = {
		"homedecor_book_cover.png",
		{ name = "homedecor_book_edges.png", color = 0xffffffff },
		{ name = "homedecor_book_pages.png", color = 0xffffffff }
		{ name = "homedecor_book_cover.png", color = hue },
		{ name = "homedecor_book_edges.png", color = "white" },
		{ name = "homedecor_book_pages.png", color = "white" }
		},
		groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1, ud_param2_colorable = 1 },
		drop = "homedecor:book",
		groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 },
		drop = "homedecor:book_"..color,
		walkable = false,
		paramtype2 = "colorwallmounted",
		palette = "unifieddyes_palette_colorwallmounted.png",
		after_place_node = unifieddyes.fix_rotation_nsew,
		after_dig_node = unifieddyes.after_dig_node,
		on_rotate = unifieddyes.fix_after_screwdriver_nsew,
		on_dig = book_dig,
		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
		local meta = minetest.get_meta(pos)
		@@ -138,7 +140,7 @@ homedecor.register("book_open", {
		end,
		on_punch = function(pos, node, puncher, pointed_thing)
		local fdir = node.param2
		minetest.swap_node(pos, { name = "homedecor:book", param2 = fdir })
		minetest.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir })
		minetest.sound_play("homedecor_book_close", {
		pos=pos,
		max_hear_distance = 3,
		@@ -151,6 +153,8 @@ homedecor.register("book_open", {
		}
		})

		end

		minetest.register_on_player_receive_fields(function(player, form_name, fields)
		if form_name ~= BOOK_FORMNAME or not fields.save then
		return
		@@ -169,67 +173,5 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
		player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:getpos())))
		end)

		-- convert old static nodes to param2

		local bookcolors = {
		"red",
		"green",
		"blue",
		"violet",
		"grey",
		"brown"
		}

		homedecor.old_static_books = {}
		for _, color in ipairs(bookcolors) do
		table.insert(homedecor.old_static_books, "homedecor:book_"..color)
		table.insert(homedecor.old_static_books, "homedecor:book_open_"..color)
		end

		minetest.register_lbm({
		name = "homedecor:convert_books",
		label = "Convert homedecor books to use param2 color",
		run_at_every_load = false,
		nodenames = homedecor.old_static_books,
		action = function(pos, node)
		local name = node.name
		local color = string.sub(name, string.find(name, "_", -7)+1)
		local newname = "homedecor:book"
		if string.find(name, "open") then
		newname = "homedecor:book_open"
		end

		local old_fdir = math.floor(node.param2 % 32)
		local new_fdir = 3

		if old_fdir == 0 then
		new_fdir = 3
		elseif old_fdir == 1 then
		new_fdir = 4
		elseif old_fdir == 2 then
		new_fdir = 2
		elseif old_fdir == 3 then
		new_fdir = 5
		end

		if color == "grey" then
		color = "dark_grey"
		elseif color == "violet" then
		color = "dark_magenta"
		elseif color == "brown" then
		color = "dark_orange"
		elseif color == "blue" then
		color = "light_blue"
		else
		color = "medium_"..color
		end

		local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted")
		local param2 = paletteidx + new_fdir

		minetest.swap_node(pos, { name = newname, param2 = param2 })
		local meta = minetest.get_meta(pos)
		meta:set_string("dye", "unifieddyes:"..color)

		end
		})
		minetest.register_alias("homedecor:book", "homedecor:book_grey")
		minetest.register_alias("homedecor:book_open", "homedecor:book_open_grey")

homedecor/init.lua

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ homedecor = {
		modpath = modpath,

		-- infinite stacks
		expect_infinite_stacks = --[[ minetest.settings:get_bool("creative_mode") and ]] not minetest.get_modpath("unified_inventory")
		expect_infinite_stacks = minetest.settings:get_bool("creative_mode") and not minetest.get_modpath("unified_inventory")
		}

		-- Determine if the item being pointed at is the underside of a node (e.g a ceiling)

homedecor/lighting.lua

+32 −7

Original line number	Diff line number	Diff line
		@@ -21,6 +21,15 @@ minetest.register_node("homedecor:glowlight_half", {
		"homedecor_glowlight_thick_sides.png",
		"homedecor_glowlight_thick_sides.png"
		},
		overlay_tiles = {
		{ name = "homedecor_glowlight_top_overlay.png", color = "white"},
		"",
		{ name = "homedecor_glowlight_thick_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_thick_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_thick_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_thick_sides_overlay.png", color = "white"},
		},
		use_texture_alpha = true,
		drawtype = "nodebox",
		paramtype = "light",
		paramtype2 = "colorwallmounted",
		@@ -52,6 +61,15 @@ minetest.register_node("homedecor:glowlight_quarter", {
		"homedecor_glowlight_thin_sides.png",
		"homedecor_glowlight_thin_sides.png"
		},
		overlay_tiles = {
		{ name = "homedecor_glowlight_top_overlay.png", color = "white"},
		"",
		{ name = "homedecor_glowlight_thin_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_thin_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_thin_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_thin_sides_overlay.png", color = "white"},
		},
		use_texture_alpha = true,
		drawtype = "nodebox",
		paramtype = "light",
		paramtype2 = "colorwallmounted",
		@@ -83,6 +101,15 @@ minetest.register_node("homedecor:glowlight_small_cube", {
		"homedecor_glowlight_cube_sides.png",
		"homedecor_glowlight_cube_sides.png"
		},
		overlay_tiles = {
		{ name = "homedecor_glowlight_cube_tb_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_cube_tb_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_cube_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_cube_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_cube_sides_overlay.png", color = "white"},
		{ name = "homedecor_glowlight_cube_sides_overlay.png", color = "white"},
		},
		use_texture_alpha = true,
		paramtype = "light",
		paramtype2 = "colorwallmounted",
		drawtype = "nodebox",
		@@ -106,9 +133,10 @@ minetest.register_node("homedecor:glowlight_small_cube", {

		homedecor.register("plasma_lamp", {
		description = S("Plasma Lamp"),
		drawtype = "glasslike_framed",
		tiles = {"default_gold_block.png","homedecor_glass_face_clean.png"},
		special_tiles = {
		drawtype = "mesh",
		mesh = "plasma_lamp.obj",
		tiles = {
		"default_gold_block.png",
		{
		name="homedecor_plasma_storm.png",
		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0},
		@@ -119,16 +147,13 @@ homedecor.register("plasma_lamp", {
		sunlight_propagates = true,
		groups = {cracky=3,oddly_breakable_by_hand=3},
		sounds = default.node_sound_glass_defaults(),
		after_place_node = function(pos, placer, itemstack, pointed_thing)
		minetest.swap_node(pos, {name = "homedecor:plasma_lamp", param2 = 255})
		end
		})

		homedecor.register("plasma_ball", {
		description = S("Plasma Ball"),
		mesh = "homedecor_plasma_ball.obj",
		tiles = {
		"homedecor_generic_plastic.png",
		{ name = "homedecor_generic_plastic.png", color = homedecor.color_black },
		{
		name = "homedecor_plasma_ball_streamers.png",
		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0},

homedecor/models/homedecor_block_with_overlay.obj

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		# Blender v2.72 (sub 0) OBJ File: 'unifiedbricks_brick_block.blend'
		# www.blender.org
		o Cube
		v 0.496092 0.496092 0.496092
		v 0.496092 0.496092 -0.496092
		v -0.496092 0.496092 -0.496092
		v -0.496092 0.496092 0.496092
		v 0.496092 -0.496092 0.496092
		v 0.496092 -0.496092 -0.496092
		v -0.496092 -0.496092 -0.496092
		v -0.496092 -0.496092 0.496092
		v 0.499750 0.499750 0.499750
		v 0.499750 0.499750 -0.499750
		v -0.499750 0.499750 -0.499750
		v -0.499750 0.499750 0.499750
		v 0.499750 -0.499750 0.499750
		v 0.499750 -0.499750 -0.499750
		v -0.499750 -0.499750 -0.499750
		v -0.499750 -0.499750 0.499750
		vt 1.000000 0.000000
		vt 1.000000 1.000000
		vt 0.000000 1.000000
		vt 0.000000 0.000000
		vn 0.000000 -1.000000 0.000000
		vn -1.000000 0.000000 0.000000
		vn 0.000000 1.000000 0.000000
		vn 1.000000 0.000000 0.000000
		vn 0.000000 0.000000 -1.000000
		vn 0.000000 0.000000 1.000000
		g Cube_Cube_base
		s off
		f 8/1/1 7/2/1 6/3/1 5/4/1
		f 4/2/2 3/3/2 7/4/2 8/1/2
		f 1/3/3 2/4/3 3/1/3 4/2/3
		f 2/2/4 1/3/4 5/4/4 6/1/4
		f 3/2/5 2/3/5 6/4/5 7/1/5
		f 1/2/6 4/3/6 8/4/6 5/1/6
		g Cube_Cube_overlay
		f 16/1/1 15/2/1 14/3/1 13/4/1
		f 12/2/2 11/3/2 15/4/2 16/1/2
		f 9/3/3 10/4/3 11/1/3 12/2/3
		f 10/2/4 9/3/4 13/4/4 14/1/4
		f 11/2/5 10/3/5 14/4/5 15/1/5
		f 9/2/6 12/3/6 16/4/6 13/1/6