From c005dc358adc8a47e744dc07f56d4ecff0358f9c Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 25 Aug 2018 02:40:17 -0400 Subject: [PATCH] minor changes to colorwallmounted palette got rid of the separate brown swatch in the colorwallmounted palette, as it was being bypassed by the brown-> medium orange translation -- replaced it with light green. fixed missing colorwallmounted light blue/azure check-and-return in get_paletteidx() --- init.lua | 9 ++++++--- .../unifieddyes_palette_colorwallmounted.png | Bin 136 -> 136 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 699f83b..39923a2 100644 --- a/init.lua +++ b/init.lua @@ -225,7 +225,6 @@ local function register_c(craft, hue, sat, val) end local dye = "dye:"..color - local recipe = minetest.serialize(craft.recipe) recipe = string.gsub(recipe, "MAIN_DYE", dye) recipe = string.gsub(recipe, "NEUTRAL_NODE", craft.neutral_node) @@ -265,6 +264,8 @@ function unifieddyes.register_color_craft(craft) local greys_table = unifieddyes.GREYS if craft.palette == "wallmounted" then + register_c(craft, "green", "", "light_") + register_c(craft, "azure", "", "") hues_table = unifieddyes.HUES_WALLMOUNTED sats_table = {""} vals_table = unifieddyes.VALS @@ -411,6 +412,7 @@ function unifieddyes.getpaletteidx(color, palette_type) local aliases = { ["pink"] = "light_red", ["brown"] = "medium_orange", + ["azure"] = "light_blue" } local grayscale = { @@ -585,9 +587,10 @@ function unifieddyes.getpaletteidx(color, palette_type) end if palette_type == "wallmounted" then - if color == "brown" then return 48,1 + if color == "green" and shade == "light" then return 48,3 + elseif color == "brown" then return 17,1 elseif color == "pink" then return 56,7 - elseif color == "blue" and shade == "light" then return 40,5 + elseif color == "azure" then return 40,5 elseif hues_wallmounted[color] and shades_wallmounted[shade] then return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color] end diff --git a/textures/unifieddyes_palette_colorwallmounted.png b/textures/unifieddyes_palette_colorwallmounted.png index 8d3133b095ed7e13b16ab1cc2fa64f0043f59c07..bcae86f3e1254e1a1f70c17a58c187f33b11b3b5 100644 GIT binary patch delta 97 zcmV-n0G|Jd0f+&RE?NV