diff options
Diffstat (limited to 'unifieddyes')
28 files changed, 38 insertions, 179 deletions
diff --git a/unifieddyes/colors.txt b/unifieddyes/colors.txt deleted file mode 100644 index f05b8a4..0000000 --- a/unifieddyes/colors.txt +++ /dev/null @@ -1,90 +0,0 @@ - - -Full-saturation colors: ------------------------ - -dark aqua 0, 84, 42 unifieddyes_dark_aqua.png -dark blue 0, 0, 84 unifieddyes_dark_blue.png -dark cyan 0, 84, 83 unifieddyes_dark_cyan.png -dark green 0, 84, 0 unifieddyes_dark_green.png -dark lime 43, 84, 0 unifieddyes_dark_lime.png -dark magenta 84, 0, 83 unifieddyes_dark_magenta.png -dark orange 84, 42, 0 unifieddyes_dark_orange.png -dark red 84, 0, 0 unifieddyes_dark_red.png -dark redviolet 84, 0, 42 unifieddyes_dark_redviolet.png -dark skyblue 0, 42, 84 unifieddyes_dark_skyblue.png -dark violet 43, 0, 84 unifieddyes_dark_violet.png -dark yellow 84, 83, 0 unifieddyes_dark_yellow.png -medium aqua 0,169, 84 unifieddyes_medium_aqua.png -medium blue 0, 0,169 unifieddyes_medium_blue.png -medium cyan 0,169,167 unifieddyes_medium_cyan.png -medium green 0,169, 0 unifieddyes_medium_green.png -medium lime 87,169, 0 unifieddyes_medium_lime.png -medium magenta 169, 0,167 unifieddyes_medium_magenta.png -medium orange 169, 84, 0 unifieddyes_medium_orange.png -medium red 168, 0, 0 unifieddyes_medium_red.png -medium redviolet 169, 0, 84 unifieddyes_medium_redviolet.png -medium skyblue 0, 84,169 unifieddyes_medium_skyblue.png -medium violet 87, 0,169 unifieddyes_medium_violet.png -medium yellow 169,167, 0 unifieddyes_medium_yellow.png -aqua 1,255,127 unifieddyes_aqua.png -blue 1, 1,255 unifieddyes_blue.png -cyan 1,255,252 unifieddyes_cyan.png -green 1,255, 1 unifieddyes_green.png -lime 132,255, 1 unifieddyes_lime.png -magenta 255, 1,252 unifieddyes_magenta.png -orange 255,127, 1 unifieddyes_orange.png -red 255, 0, 0 unifieddyes_red.png -redviolet 255, 1,127 unifieddyes_redviolet.png -skyblue 1,127,255 unifieddyes_skyblue.png -violet 132, 1,255 unifieddyes_violet.png -yellow 255,252, 1 unifieddyes_yellow.png - -Low-saturation colors: ----------------------- - -dark aqua 50% saturation 21, 63, 42 unifieddyes_dark_aqua_s50.png -dark blue 50% saturation 21, 21, 63 unifieddyes_dark_blue_s50.png -dark cyan 50% saturation 21, 63, 63 unifieddyes_dark_cyan_s50.png -dark green 50% saturation 21, 63, 21 unifieddyes_dark_green_s50.png -dark lime 50% saturation 43, 63, 21 unifieddyes_dark_lime_s50.png -dark magenta 50% saturation 63, 21, 63 unifieddyes_dark_magenta_s50.png -dark orange 50% saturation 63, 42, 21 unifieddyes_dark_orange_s50.png -dark red 50% saturation 63, 21, 21 unifieddyes_dark_red_s50.png -dark redviolet 50% saturation 63, 21, 42 unifieddyes_dark_redviolet_s50.png -dark skyblue 50% saturation 21, 42, 63 unifieddyes_dark_skyblue_s50.png -dark violet 50% saturation 43, 21, 63 unifieddyes_dark_violet_s50.png -dark yellow 50% saturation 63, 63, 21 unifieddyes_dark_yellow_s50.png -medium aqua 50% saturation 42,126, 84 unifieddyes_medium_aqua_s50.png -medium blue 50% saturation 42, 42,126 unifieddyes_medium_blue_s50.png -medium cyan 50% saturation 42,126,126 unifieddyes_medium_cyan_s50.png -medium green 50% saturation 42,126, 42 unifieddyes_medium_green_s50.png -medium lime 50% saturation 86,126, 42 unifieddyes_medium_lime_s50.png -medium magenta 50% saturation 126, 42,126 unifieddyes_medium_magenta_s50.png -medium orange 50% saturation 126, 84, 42 unifieddyes_medium_orange_s50.png -medium red 50% saturation 127, 42, 42 unifieddyes_medium_red_s50.png -medium redviolet 50% saturation 126, 42, 84 unifieddyes_medium_redviolet_s50.png -medium skyblue 50% saturation 42, 84,126 unifieddyes_medium_skyblue_s50.png -medium violet 50% saturation 86, 42,126 unifieddyes_medium_violet_s50.png -medium yellow 50% saturation 126,126, 42 unifieddyes_medium_yellow_s50.png -aqua 50% saturation 65,191,127 unifieddyes_aqua_s50.png -blue 50% saturation 65, 65,191 unifieddyes_blue_s50.png -cyan 50% saturation 65,191,190 unifieddyes_cyan_s50.png -green 50% saturation 65,191, 65 unifieddyes_green_s50.png -lime 50% saturation 130,191, 65 unifieddyes_lime_s50.png -magenta 50% saturation 191, 65,190 unifieddyes_magenta_s50.png -orange 50% saturation 191,127, 65 unifieddyes_orange_s50.png -red 50% saturation 192, 64, 64 unifieddyes_red_s50.png -redviolet 50% saturation 191, 65,127 unifieddyes_redviolet_s50.png -skyblue 50% saturation 65,127,191 unifieddyes_skyblue_s50.png -violet 50% saturation 130, 65,191 unifieddyes_violet_s50.png -yellow 50% saturation 191,190, 65 unifieddyes_yellow_s50.png - -Greyscale: ----------- - -black 0, 0, 0 unifieddyes_black.png -dark grey 64, 64, 64 unifieddyes_darkgrey_paint.png -medium grey 128,128,128 unifieddyes_grey_paint.png -light grey 192,192,192 unifieddyes_lightgrey_paint.png -white 255,255,255 unifieddyes_white_paint.png diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua index 09b156f..36007dd 100644 --- a/unifieddyes/init.lua +++ b/unifieddyes/init.lua @@ -41,26 +41,6 @@ else S = function(s) return s end end --- helper functions for other mods that use this one - -unifieddyes.HUES = { - "red", - "orange", - "yellow", - "lime", - "green", - "aqua", - "cyan", - "skyblue", - "blue", - "violet", - "magenta", - "redviolet" -} - -unifieddyes.HUES_WITH_GREY = table.copy(unifieddyes.HUES) -table.insert(unifieddyes.HUES_WITH_GREY, "grey") - -- the names of the various colors here came from http://www.procato.com/rgb+index/ unifieddyes.HUES_EXTENDED = { @@ -90,6 +70,13 @@ unifieddyes.HUES_EXTENDED = { { "crimson", 0xff, 0x00, 0x40 } } +unifieddyes.HUES_WITH_GREY = {} + +for _,i in ipairs(unifieddyes.HUES_EXTENDED) do + table.insert(unifieddyes.HUES_WITH_GREY, i[1]) +end +table.insert(unifieddyes.HUES_WITH_GREY, "grey") + unifieddyes.HUES_WALLMOUNTED = { "red", "orange", @@ -162,8 +149,6 @@ unifieddyes.player_last_right_clicked = {} unifieddyes.palette_has_color = {} unifieddyes.player_showall = {} --- unifieddyes.player_last_right_clicked[placer:get_player_name()] = {pos = pos, node = node, def = def} - -- if a node with a palette is placed in the world, -- but the itemstack used to place it has no palette_index (color byte), -- create something appropriate to make it officially white. @@ -215,9 +200,9 @@ function unifieddyes.generate_split_palette_nodes(name, def, drop) local def2 = table.copy(def) local desc_color = string.gsub(string.upper(string.sub(color, 1, 1))..string.sub(color, 2), "_", " ") if string.sub(def2.description, -1) == ")" then - def2.description = string.sub(def2.description, 1, -2)..", "..desc_color..")" + def2.description = string.sub(def2.description, 1, -2)..", "..desc_color.." shades)" else - def2.description = def2.description.."("..desc_color..")" + def2.description = def2.description.."("..desc_color.." shades)" end def2.palette = "unifieddyes_palette_"..color.."s.png" def2.paramtype2 = "colorfacedir" @@ -247,13 +232,14 @@ end -- these helper functions register all of the recipes needed to create colored -- nodes with any of the dyes supported by that node's palette. -local function register_c(craft, hue, sat, val) +local function register_c(craft, h, sat, val) + local hue = (type(h) == "table") and h[1] or h local color = "" if val then - if craft.palette ~= "extended" then + if craft.palette == "wallmounted" then color = val..hue..sat else - color = val..hue[1]..sat + color = val..hue..sat end else color = hue -- if val is nil, then it's grey. @@ -294,7 +280,7 @@ local function register_c(craft, hue, sat, val) end function unifieddyes.register_color_craft(craft) - local hues_table = unifieddyes.HUES + local hues_table = unifieddyes.HUES_EXTENDED local sats_table = unifieddyes.SATS local vals_table = unifieddyes.VALS local greys_table = unifieddyes.GREYS @@ -306,7 +292,6 @@ function unifieddyes.register_color_craft(craft) sats_table = {""} vals_table = unifieddyes.VALS elseif craft.palette == "extended" then - hues_table = unifieddyes.HUES_EXTENDED vals_table = unifieddyes.VALS_EXTENDED greys_table = unifieddyes.GREYS_EXTENDED end @@ -391,10 +376,10 @@ end function unifieddyes.get_hsv(name) -- expects a node/item name local hue = "" local a,b - for _, i in ipairs(unifieddyes.HUES) do - a,b = string.find(name, "_"..i) - if a and not ( string.find(name, "_redviolet") and i == "red" ) then - hue = i + for _, i in ipairs(unifieddyes.HUES_EXTENDED) do + a,b = string.find(name, "_"..i[1]) + if a then + hue = i[1] break end end @@ -424,9 +409,10 @@ end -- in the function below, color is just a color string, while -- palette_type can be: -- --- "split" = 89 color palette split into pieces for colorfacedir --- "wallmounted" = 32-color abridged palette -- "extended" = 256 color palette +-- "split" = 200 color palette split into pieces for colorfacedir +-- "wallmounted" = 32-color abridged palette + function unifieddyes.getpaletteidx(color, palette_type) @@ -475,24 +461,6 @@ function unifieddyes.getpaletteidx(color, palette_type) ["black"] = 4, } - local hues = { - ["red"] = 1, - ["orange"] = 2, - ["yellow"] = 3, - ["lime"] = 4, - ["green"] = 5, - ["aqua"] = 6, - ["spring"] = 6, - ["cyan"] = 7, - ["skyblue"] = 8, - ["azure"] = 8, - ["blue"] = 9, - ["violet"] = 10, - ["magenta"] = 11, - ["redviolet"] = 12, - ["rose"] = 12, - } - local hues_extended = { ["red"] = 0, ["vermilion"] = 1, @@ -544,6 +512,17 @@ function unifieddyes.getpaletteidx(color, palette_type) ["darks50"] = 7, } + local shades_split = { + ["faint"] = 0, + [""] = 1, + ["s50"] = 2, + ["light"] = 3, + ["medium"] = 4, + ["mediums50"] = 5, + ["dark"] = 6, + ["darks50"] = 7, + } + local shades_extended = { ["faint"] = 0, ["pastel"] = 1, @@ -627,19 +606,8 @@ function unifieddyes.getpaletteidx(color, palette_type) shade = "light" end if palette_type == "split" then -- it's colorfacedir - - -- If using this palette, translate new color names back to old. - - if color == "spring" then - color = "aqua" - elseif color == "azure" then - color = "skyblue" - elseif color == "rose" then - color = "redviolet" - end - - if hues[color] and shades[shade] then - return (shades[shade] * 32), hues[color] + if hues_extended[color] and shades_split[shade] then + return (shades_split[shade] * 32), hues_extended[color]+1 end elseif palette_type == "extended" then if hues_extended[color] and shades_extended[shade] then @@ -730,7 +698,7 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing) newcolor = string.sub(painting_with, 5) else if hue ~= 0 then - newcolor = unifieddyes.HUES[hue] + newcolor = unifieddyes.HUES_EXTENDED[hue][1] else newcolor = "grey" end @@ -743,10 +711,6 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing) end end - if newcolor == "spring" then newcolor = "aqua" - elseif newcolor == "azure" then newcolor = "skyblue" - elseif newcolor == "rose" then newcolor = "redviolet" - end name = modname..":"..string.gsub(nodename2, oldcolor, newcolor) if not minetest.registered_items[name] then @@ -813,16 +777,16 @@ function unifieddyes.color_to_name(param2, def) local h = color - v * 8 return unifieddyes.VALS[v]..unifieddyes.HUES_WALLMOUNTED[h+1] - elseif string.find(def.palette, "unifieddyes_palette") then -- it's the "split" 89-color palette + elseif string.find(def.palette, "unifieddyes_palette") then -- it's the split palette -- palette names in this mode are always "unifieddyes_palette_COLORs.png" local s = string.sub(def.palette, 21) local color = string.sub(s, 1, string.find(s, "s.png")-1) local v = math.floor(param2/32) - if v == 0 then return "white" end if color ~= "grey" then - if v == 1 then return color + if v == 0 then return "faint_"..color + elseif v == 1 then return color elseif v == 2 then return color.."_s50" elseif v == 3 then return "light_"..color elseif v == 4 then return "medium_"..color @@ -1206,14 +1170,6 @@ for _, h in ipairs(unifieddyes.HUES_EXTENDED) do end end minetest.register_alias("unifieddyes:"..val..hue, "dye:"..val..hue) - if h[1] == "spring" then - minetest.register_alias("unifieddyes:"..val.."aqua", "dye:"..val.."spring") - elseif h[1] == "azure" then - minetest.register_alias("unifieddyes:"..val.."skyblue", "dye:"..val.."azure") - elseif h[1] == "rose" then - minetest.register_alias("unifieddyes:"..val.."redviolet", "dye:"..val.."rose") - end - if v > 3 then -- also register the low-sat version @@ -1234,13 +1190,6 @@ for _, h in ipairs(unifieddyes.HUES_EXTENDED) do groups = { dye=1, not_in_creative_inventory=1 }, }) minetest.register_alias("unifieddyes:"..val..hue.."_s50", "dye:"..val..hue.."_s50") - if h[1] == "spring" then - minetest.register_alias("unifieddyes:"..val.."aqua_s50", "dye:"..val.."spring_s50") - elseif h[1] == "azure" then - minetest.register_alias("unifieddyes:"..val.."skyblue_s50", "dye:"..val.."azure_s50") - elseif h[1] == "rose" then - minetest.register_alias("unifieddyes:"..val.."redviolet_s50", "dye:"..val.."rose_s50") - end end end end diff --git a/unifieddyes/textures/unifieddyes_palette_ambers.png b/unifieddyes/textures/unifieddyes_palette_ambers.png Binary files differnew file mode 100644 index 0000000..e4b6cf0 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_ambers.png diff --git a/unifieddyes/textures/unifieddyes_palette_azures.png b/unifieddyes/textures/unifieddyes_palette_azures.png Binary files differnew file mode 100644 index 0000000..ce78911 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_azures.png diff --git a/unifieddyes/textures/unifieddyes_palette_blues.png b/unifieddyes/textures/unifieddyes_palette_blues.png Binary files differindex b83e22d..f2aec3b 100644 --- a/unifieddyes/textures/unifieddyes_palette_blues.png +++ b/unifieddyes/textures/unifieddyes_palette_blues.png diff --git a/unifieddyes/textures/unifieddyes_palette_ceruleans.png b/unifieddyes/textures/unifieddyes_palette_ceruleans.png Binary files differnew file mode 100644 index 0000000..0e47149 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_ceruleans.png diff --git a/unifieddyes/textures/unifieddyes_palette_chartreuses.png b/unifieddyes/textures/unifieddyes_palette_chartreuses.png Binary files differnew file mode 100644 index 0000000..613935e --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_chartreuses.png diff --git a/unifieddyes/textures/unifieddyes_palette_crimsons.png b/unifieddyes/textures/unifieddyes_palette_crimsons.png Binary files differnew file mode 100644 index 0000000..4f2dd47 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_crimsons.png diff --git a/unifieddyes/textures/unifieddyes_palette_cyans.png b/unifieddyes/textures/unifieddyes_palette_cyans.png Binary files differindex 0b0b094..35c5f8a 100644 --- a/unifieddyes/textures/unifieddyes_palette_cyans.png +++ b/unifieddyes/textures/unifieddyes_palette_cyans.png diff --git a/unifieddyes/textures/unifieddyes_palette_fuchsias.png b/unifieddyes/textures/unifieddyes_palette_fuchsias.png Binary files differnew file mode 100644 index 0000000..1fbde3e --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_fuchsias.png diff --git a/unifieddyes/textures/unifieddyes_palette_greens.png b/unifieddyes/textures/unifieddyes_palette_greens.png Binary files differindex b381841..cdf2c23 100644 --- a/unifieddyes/textures/unifieddyes_palette_greens.png +++ b/unifieddyes/textures/unifieddyes_palette_greens.png diff --git a/unifieddyes/textures/unifieddyes_palette_harlequins.png b/unifieddyes/textures/unifieddyes_palette_harlequins.png Binary files differnew file mode 100644 index 0000000..0a440ab --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_harlequins.png diff --git a/unifieddyes/textures/unifieddyes_palette_indigos.png b/unifieddyes/textures/unifieddyes_palette_indigos.png Binary files differnew file mode 100644 index 0000000..0c6e1ba --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_indigos.png diff --git a/unifieddyes/textures/unifieddyes_palette_limes.png b/unifieddyes/textures/unifieddyes_palette_limes.png Binary files differindex b104c6e..351931e 100644 --- a/unifieddyes/textures/unifieddyes_palette_limes.png +++ b/unifieddyes/textures/unifieddyes_palette_limes.png diff --git a/unifieddyes/textures/unifieddyes_palette_magentas.png b/unifieddyes/textures/unifieddyes_palette_magentas.png Binary files differindex 16abf00..e1cabe7 100644 --- a/unifieddyes/textures/unifieddyes_palette_magentas.png +++ b/unifieddyes/textures/unifieddyes_palette_magentas.png diff --git a/unifieddyes/textures/unifieddyes_palette_malachites.png b/unifieddyes/textures/unifieddyes_palette_malachites.png Binary files differnew file mode 100644 index 0000000..ecb944f --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_malachites.png diff --git a/unifieddyes/textures/unifieddyes_palette_mulberrys.png b/unifieddyes/textures/unifieddyes_palette_mulberrys.png Binary files differnew file mode 100644 index 0000000..25e3074 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_mulberrys.png diff --git a/unifieddyes/textures/unifieddyes_palette_oranges.png b/unifieddyes/textures/unifieddyes_palette_oranges.png Binary files differindex cae1f4d..f7b74e3 100644 --- a/unifieddyes/textures/unifieddyes_palette_oranges.png +++ b/unifieddyes/textures/unifieddyes_palette_oranges.png diff --git a/unifieddyes/textures/unifieddyes_palette_reds.png b/unifieddyes/textures/unifieddyes_palette_reds.png Binary files differindex 7f63bb3..1e9182f 100644 --- a/unifieddyes/textures/unifieddyes_palette_reds.png +++ b/unifieddyes/textures/unifieddyes_palette_reds.png diff --git a/unifieddyes/textures/unifieddyes_palette_redviolets.png b/unifieddyes/textures/unifieddyes_palette_redviolets.png Binary files differdeleted file mode 100644 index 30d6c9a..0000000 --- a/unifieddyes/textures/unifieddyes_palette_redviolets.png +++ /dev/null diff --git a/unifieddyes/textures/unifieddyes_palette_roses.png b/unifieddyes/textures/unifieddyes_palette_roses.png Binary files differnew file mode 100644 index 0000000..bc78fc4 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_roses.png diff --git a/unifieddyes/textures/unifieddyes_palette_sapphires.png b/unifieddyes/textures/unifieddyes_palette_sapphires.png Binary files differnew file mode 100644 index 0000000..bbab0b3 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_sapphires.png diff --git a/unifieddyes/textures/unifieddyes_palette_skyblues.png b/unifieddyes/textures/unifieddyes_palette_skyblues.png Binary files differdeleted file mode 100644 index 59396b1..0000000 --- a/unifieddyes/textures/unifieddyes_palette_skyblues.png +++ /dev/null diff --git a/unifieddyes/textures/unifieddyes_palette_springs.png b/unifieddyes/textures/unifieddyes_palette_springs.png Binary files differnew file mode 100644 index 0000000..a4d317c --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_springs.png diff --git a/unifieddyes/textures/unifieddyes_palette_turquoises.png b/unifieddyes/textures/unifieddyes_palette_turquoises.png Binary files differnew file mode 100644 index 0000000..1b11e24 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_turquoises.png diff --git a/unifieddyes/textures/unifieddyes_palette_vermilions.png b/unifieddyes/textures/unifieddyes_palette_vermilions.png Binary files differnew file mode 100644 index 0000000..23653b0 --- /dev/null +++ b/unifieddyes/textures/unifieddyes_palette_vermilions.png diff --git a/unifieddyes/textures/unifieddyes_palette_violets.png b/unifieddyes/textures/unifieddyes_palette_violets.png Binary files differindex 6238217..3a08ceb 100644 --- a/unifieddyes/textures/unifieddyes_palette_violets.png +++ b/unifieddyes/textures/unifieddyes_palette_violets.png diff --git a/unifieddyes/textures/unifieddyes_palette_yellows.png b/unifieddyes/textures/unifieddyes_palette_yellows.png Binary files differindex 0a458a7..044ba99 100644 --- a/unifieddyes/textures/unifieddyes_palette_yellows.png +++ b/unifieddyes/textures/unifieddyes_palette_yellows.png |
