summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-08-25 02:40:17 -0400
committerVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-08-25 02:40:17 -0400
commitc005dc358adc8a47e744dc07f56d4ecff0358f9c (patch)
tree8ad5ab3484372ed1de31de64fd9bec0f66a929f8
parentc7fc48c8d026f2ac859746e53d8394b127311541 (diff)
downloadunifieddyes-c005dc358adc8a47e744dc07f56d4ecff0358f9c.tar
unifieddyes-c005dc358adc8a47e744dc07f56d4ecff0358f9c.tar.gz
unifieddyes-c005dc358adc8a47e744dc07f56d4ecff0358f9c.tar.bz2
unifieddyes-c005dc358adc8a47e744dc07f56d4ecff0358f9c.tar.xz
unifieddyes-c005dc358adc8a47e744dc07f56d4ecff0358f9c.zip
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()
-rw-r--r--init.lua9
-rw-r--r--textures/unifieddyes_palette_colorwallmounted.pngbin136 -> 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 8d3133b..bcae86f 100644
--- a/textures/unifieddyes_palette_colorwallmounted.png
+++ b/textures/unifieddyes_palette_colorwallmounted.png
Binary files differ