change airbrush recipe

to 1 brass ingot, 2 steel ingots, and 1 plastic sheet

init.lua

@@ -99,6 +99,14 @@ unifieddyes.VALS = {
 	"dark_"
 }
 
+unifieddyes.VALS_SPLIT = {
+	"faint_",
+	"light_",
+	"",
+	"medium_",
+	"dark_"
+}
+
 unifieddyes.VALS_EXTENDED = {
 	"faint_",
 	"pastel_",
@@ -164,20 +172,25 @@ minetest.register_on_placenode(
 		end
 
 		if not string.find(itemstack:to_string(), "palette_index") then
-			local param2 = 0
+			local param2
 			local color = 0
 
-			if def.palette == "unifieddyes_palette_extended.png" then
+			if def.palette == "unifieddyes_palette_extended.png"
+			  and def.paramtype2 == "color" then
 				param2 = 240
 				color = 240
-			elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
+			elseif def.palette == "unifieddyes_palette_colorwallmounted.png"
+			  and def.paramtype2 == "colorwallmounted" then
 				param2 = newnode.param2 % 8
-			else  -- it's a split palette
+			elseif string.find(def.palette, "unifieddyes_palette_")
+			  and def.paramtype2 == "colorfacedir" then -- it's a split palette
 				param2 = newnode.param2 % 32
 			end
 
-			minetest.swap_node(pos, {name = newnode.name, param2 = param2})
-			minetest.get_meta(pos):set_int("palette_index", color)
+			if param2 then
+				minetest.swap_node(pos, {name = newnode.name, param2 = param2})
+				minetest.get_meta(pos):set_int("palette_index", color)
+			end
 		end
 	end
 )
@@ -282,7 +295,7 @@ end
 function unifieddyes.register_color_craft(craft)
 	local hues_table = unifieddyes.HUES_EXTENDED
 	local sats_table = unifieddyes.SATS
-	local vals_table = unifieddyes.VALS
+	local vals_table = unifieddyes.VALS_SPLIT
 	local greys_table = unifieddyes.GREYS
 
 	if craft.palette == "wallmounted" then
@@ -654,7 +667,10 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
 
 	local palette = nil
 	local fdir = 0
-	if def.palette == "unifieddyes_palette_extended.png" then
+	if not def or not def.palette then
+		minetest.chat_send_player(player_name, "*** That node can't be colored -- it's either undefined or has no palette.")
+		return
+	elseif def.palette == "unifieddyes_palette_extended.png" then
 		palette = "extended"
 	elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
 		palette = "wallmounted"
@@ -806,10 +822,17 @@ end
 
 local hps = 0.6 -- horizontal position scale
 local vps = 1.3 -- vertical position scale
-local vs = 0.3  -- vertical shift/offset
+local vs = 0.1 -- vertical shift/offset
+
 local color_button_size = ";0.75,0.75;"
 local color_square_size = ";0.69,0.69;"
 
+function unifieddyes.make_readable_color(color)
+	local s = string.gsub(color, "_", " ")
+	s = string.gsub(s, "s50", "(low saturation)")
+	return s
+end
+
 function unifieddyes.make_colored_square(hexcolor, colorname, showall, creative, painting_with, nodepalette, hp, v2, selindic, inv, explist)
 
 	local dye = "dye:"..colorname
@@ -831,26 +854,29 @@ function unifieddyes.make_colored_square(hexcolor, colorname, showall, creative,
 		end
 	end
 
+	local tooltip = "tooltip["..colorname..";"..
+					unifieddyes.make_readable_color(colorname)..
+					"\n(dye:"..colorname..")]"
+
 	if dye == painting_with then
 		overlay = "^unifieddyes_select_overlay.png"
-		selindic = "unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..
-					"tooltip["..colorname..";"..colorname.."]"
+		selindic = "unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..tooltip
 	end
-	local form
 
+	local form
 	if unavail_overlay == "" then
 		form = "image_button["..
 					(hp*hps)..","..(v2*vps+vs)..
 					color_button_size..
 					"unifieddyes_white_square.png"..colorize..overlay..unavail_overlay..";"..
 					colorname..";]"..
-					"tooltip["..colorname..";"..colorname.."]"
+					tooltip
 	else
 		form = "image["..
 					(hp*hps)..","..(v2*vps+vs)..
 					color_square_size..
 					"unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..
-					"tooltip["..colorname.." (unavailable);"..colorname.."]"
+					tooltip
 	end
 
 	return form, selindic
@@ -868,7 +894,7 @@ function unifieddyes.show_airbrush_form(player)
 	local nodepalette = "extended"
 	local showall = unifieddyes.player_showall[player_name]
 
-	t[1] = "size[15,8.5]label[7,-0.25;Select a color:]"
+	t[1] = "size[14.5,8.5]label[7,-0.3;Select a color:]"
 	local selindic = "unifieddyes_select_overlay.png^unifieddyes_question.png]"
 
 	local last_right_click = unifieddyes.player_last_right_clicked[player_name]
@@ -904,7 +930,7 @@ function unifieddyes.show_airbrush_form(player)
 
 		for hi, h in ipairs(unifieddyes.HUES_EXTENDED) do
 			local hue = h[1]
-			local hp=hi-0.5
+			local hp=hi-1
 
 			local r = h[2]
 			local g = h[3]
@@ -932,7 +958,7 @@ function unifieddyes.show_airbrush_form(player)
 
 			for hi, h in ipairs(unifieddyes.HUES_EXTENDED) do
 				local hue = h[1]
-				local hp=hi-0.5
+				local hp=hi-1
 
 				local r = h[2]
 				local g = h[3]
@@ -964,7 +990,7 @@ function unifieddyes.show_airbrush_form(player)
 	local v2=5
 	for y = 0, 15 do
 
-		local hp=(15-y)+0.5
+		local hp=15-y
 
 		local hexgrey = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
 		local grey = "grey_"..y
@@ -983,48 +1009,52 @@ function unifieddyes.show_airbrush_form(player)
 	end
 
 	if not creative then
-		t[#t+1] = "image[10.3,"
-		t[#t+1] = (vps*5+vs)
+		t[#t+1] = "image[10,"
+		t[#t+1] = (vps*5.55+vs)
 		t[#t+1] = color_button_size
-		t[#t+1] = "unifieddyes_onhand_overlay.png]label[11.0,"
-		t[#t+1] = (vps*5.02+vs)
+		t[#t+1] = "unifieddyes_onhand_overlay.png]label[10.7,"
+		t[#t+1] = (vps*5.51+vs)
 		t[#t+1] = ";Dyes]"
-		t[#t+1] = "label[11.0,"
-		t[#t+1] = (vps*5.18+vs)
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*5.67+vs)
 		t[#t+1] = ";on hand]"
 
 	end
 
-	t[#t+1] = "image[11.9,"
+	t[#t+1] = "image[10,"
 	t[#t+1] = (vps*5+vs)
 	t[#t+1] = color_button_size
 	t[#t+1] = selindic
 
 	if painting_with then
-		t[#t+1] = "label[12.6,"
-		t[#t+1] = (vps*5.02+vs)
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*4.90+vs)
 		t[#t+1] = ";Your selection:]"
-		t[#t+1] = "label[12.6,"
-		t[#t+1] = (vps*5.18+vs)
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*5.07+vs)
 		t[#t+1] = ";"
+		t[#t+1] = unifieddyes.make_readable_color(string.sub(painting_with, 5))
+		t[#t+1] = "]label[10.7,"
+		t[#t+1] = (vps*5.24+vs)
+		t[#t+1] = ";("
 		t[#t+1] = painting_with
-		t[#t+1] = "]"
+		t[#t+1] = ")]"
 	else
-		t[#t+1] = "label[12.6,"
-		t[#t+1] = (vps*5.1+vs)
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*5.07+vs)
 		t[#t+1] = ";Your selection]"
 	end
 
-	t[#t+1] = "button_exit[11,8;2,1;cancel;Cancel]button_exit[13,8;2,1;accept;Accept]"
+	t[#t+1] = "button_exit[10.5,8;2,1;cancel;Cancel]button_exit[12.5,8;2,1;accept;Accept]"
 
 
 	if last_right_click and last_right_click.def and nodepalette ~= "extended" then
 		if showall then
-			t[#t+1] = "button[0.5,8;2,1;show_avail;Show Available]"
-			t[#t+1] = "label[2.5,8.25;(Currently showing all 256 colors)]"
+			t[#t+1] = "button[0,8;2,1;show_avail;Show Available]"
+			t[#t+1] = "label[2,8.25;(Currently showing all 256 colors)]"
 		else
-			t[#t+1] = "button[0.5,8;2,1;show_all;Show All Colors]"
-			t[#t+1] = "label[2.5,8.25;(Currently only showing what the right-clicked node can use)]"
+			t[#t+1] = "button[0,8;2,1;show_all;Show All Colors]"
+			t[#t+1] = "label[2,8.25;(Currently only showing what the right-clicked node can use)]"
 		end
 	end
 
@@ -1072,9 +1102,9 @@ minetest.register_tool("unifieddyes:airbrush", {
 minetest.register_craft( {
 	output = "unifieddyes:airbrush",
 	recipe = {
-		{ "default:gold_ingot", "",                    "bucket:bucket_empty" },
-		{ "",                   "default:steel_ingot", ""                    },
-		{ "",                   "",                    "default:steel_ingot" }
+		{ "basic_materials:brass_ingot", "",           "basic_materials:plastic_sheet" },
+		{ "",                   "default:steel_ingot", ""                              },
+		{ "",                   "",                    "default:steel_ingot"           }
 	},
 })