summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-02-06 09:22:10 -0500
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-02-06 09:22:10 -0500
commit4d11406f8d2a40bc6c08494fb40e677160eab294 (patch)
treee38285b1b607a8de1dfb6b44bf06c3dbdadd5059
parente3b7e9d5346f8f1b143bc1914911b36ed04521b1 (diff)
downloadunifieddyes-4d11406f8d2a40bc6c08494fb40e677160eab294.tar
unifieddyes-4d11406f8d2a40bc6c08494fb40e677160eab294.tar.gz
unifieddyes-4d11406f8d2a40bc6c08494fb40e677160eab294.tar.bz2
unifieddyes-4d11406f8d2a40bc6c08494fb40e677160eab294.tar.xz
unifieddyes-4d11406f8d2a40bc6c08494fb40e677160eab294.zip
Pink/brown color translation tweaks
Only perform pink -> light_red and brown -> dark_orange translations if not using the "colorwallmounted" palette.
-rw-r--r--init.lua36
1 files changed, 22 insertions, 14 deletions
diff --git a/init.lua b/init.lua
index ef667da..7deb976 100644
--- a/init.lua
+++ b/init.lua
@@ -223,9 +223,6 @@ function unifieddyes.getpaletteidx(color, is_color_fdir)
return
end
- color = aliases[color] or color
- local idx
-
if is_color_fdir == "wallmounted" then
if grayscale_wallmounted[color] then
return (grayscale_wallmounted[color] * 8), 0
@@ -257,16 +254,25 @@ function unifieddyes.getpaletteidx(color, is_color_fdir)
end
if is_color_fdir == "wallmounted" then
- if shade == "dark" and color == "orange" then return 48,1 -- brown
- elseif shade == "light" and color == "red" then return 56,7 -- pink
+ if color == "brown" then return 48,1
+ elseif color == "pink" then return 56,7
elseif hues_wallmounted[color] and shades_wallmounted[shade] then
return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color]
end
- elseif hues[color] and shades[shade] then
- if is_color_fdir then
- return (shades[shade] * 32), hues[color]
- else
- return (hues[color] * 8 + shades[shade]), hues[color]
+ 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
+ return (shades[shade] * 32), hues[color]
+ else
+ return (hues[color] * 8 + shades[shade]), hues[color]
+ end
end
end
end
@@ -298,10 +304,12 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
local nodedef = minetest.registered_nodes[node.name]
local playername = player:get_player_name()
- -- if the node has an on_punch defined, bail out and call that instead.
- local onpunch = nodedef.on_punch(pos, node, player, pointed_thing)
- if onpunch then
- return onpunch
+ -- 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)
+ if onpunch then
+ return onpunch
+ end
end
-- if the target is unknown, has no groups defined, or isn't UD-colorable, just bail out