mff/unifieddyes
1
0
Fork 0
forked from mtcontrib/unifieddyes
Code Issues Pull Requests Releases Wiki Activity

Pink/brown color translation tweaks

Browse Source 
Only perform pink -> light_red and brown -> dark_orange translations if
not using the "colorwallmounted" palette.
This commit is contained in:
Vanessa Ezekowitz 2017-02-06 09:22:10 -05:00
parent e3b7e9d534
commit 4d11406f8d
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
init.lua
View File

@ -223,9 +223,6 @@ function unifieddyes.getpaletteidx(color, is_color_fdir)
return return
end end
color = aliases[color] or color
local idx
if is_color_fdir == "wallmounted" then if is_color_fdir == "wallmounted" then
if grayscale_wallmounted[color] then if grayscale_wallmounted[color] then
return (grayscale_wallmounted[color] * 8), 0 return (grayscale_wallmounted[color] * 8), 0
@ -257,12 +254,20 @@ function unifieddyes.getpaletteidx(color, is_color_fdir)
end end
if is_color_fdir == "wallmounted" then if is_color_fdir == "wallmounted" then
if shade == "dark" and color == "orange" then return 48,1 -- brown if color == "brown" then return 48,1
elseif shade == "light" and color == "red" then return 56,7 -- pink elseif color == "pink" then return 56,7
elseif hues_wallmounted[color] and shades_wallmounted[shade] then elseif hues_wallmounted[color] and shades_wallmounted[shade] then
return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color] return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color]
end end
elseif hues[color] and shades[shade] then else
if color == "brown" then
color = "orange"
shade = "dark"
elseif color == "pink" then
color = "red"
shade = "light"
end
if hues[color] and shades[shade] then
if is_color_fdir then if is_color_fdir then
return (shades[shade] * 32), hues[color] return (shades[shade] * 32), hues[color]
else else
@ -270,6 +275,7 @@ function unifieddyes.getpaletteidx(color, is_color_fdir)
end end
end end
end end
end
function unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger) function unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
local prevdye local prevdye
@ -298,11 +304,13 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
local nodedef = minetest.registered_nodes[node.name] local nodedef = minetest.registered_nodes[node.name]
local playername = player:get_player_name() local playername = player:get_player_name()
-- if the node has an on_punch defined, bail out and call that instead. -- if the node has an on_punch defined, bail out and call that instead, unless "sneak" is pressed.
if not player:get_player_control().sneak then
local onpunch = nodedef.on_punch(pos, node, player, pointed_thing) local onpunch = nodedef.on_punch(pos, node, player, pointed_thing)
if onpunch then if onpunch then
return onpunch return onpunch
end end
end
-- if the target is unknown, has no groups defined, or isn't UD-colorable, just bail out -- if the target is unknown, has no groups defined, or isn't UD-colorable, just bail out
if not (nodedef and nodedef.groups and nodedef.groups.ud_param2_colorable) then if not (nodedef and nodedef.groups and nodedef.groups.ud_param2_colorable) then