mtcontrib/unifieddyes
1
0
Fork 1
mirror of https://github.com/mt-mods/unifieddyes.git synced 2024-12-25 18:20:27 +01:00
Code Issues Releases Wiki Activity

make some color tables globally accessible (in unifieddyes namespace)

Browse Source
This commit is contained in:
Vanessa Ezekowitz 2017-02-24 22:42:42 -05:00
parent e3f73e07e7
commit 91d260b538
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
init.lua
View File

@ -43,7 +43,7 @@ end
-- helper functions for other mods that use this one -- helper functions for other mods that use this one
local HUES = { unifieddyes.HUES = {
"red", "red",
"orange", "orange",
"yellow", "yellow",
@ -60,7 +60,7 @@ local HUES = {
-- the names of the various colors here came from http://www.procato.com/rgb+index/ -- the names of the various colors here came from http://www.procato.com/rgb+index/
local HUES_EXTENDED = { unifieddyes.HUES_EXTENDED = {
{ "red", 0xff, 0x00, 0x00 }, { "red", 0xff, 0x00, 0x00 },
{ "vermilion", 0xff, 0x40, 0x00 }, { "vermilion", 0xff, 0x40, 0x00 },
{ "orange", 0xff, 0x80, 0x00 }, { "orange", 0xff, 0x80, 0x00 },
@ -87,18 +87,18 @@ local HUES_EXTENDED = {
{ "crimson", 0xff, 0x00, 0x40 } { "crimson", 0xff, 0x00, 0x40 }
} }
local SATS = { unifieddyes.SATS = {
"", "",
"_s50" "_s50"
} }
local VALS = { unifieddyes.VALS = {
"", "",
"medium_", "medium_",
"dark_" "dark_"
} }
local VALS_EXTENDED = { unifieddyes.VALS_EXTENDED = {
"faint_", "faint_",
"pastel_", "pastel_",
"light_", "light_",
@ -108,7 +108,7 @@ local VALS_EXTENDED = {
"dark_" "dark_"
} }
local GREYS = { unifieddyes.GREYS = {
"white", "white",
"light_grey", "light_grey",
"grey", "grey",
@ -213,7 +213,7 @@ end
function unifieddyes.get_hsv(name) -- expects a node/item name function unifieddyes.get_hsv(name) -- expects a node/item name
local hue = "" local hue = ""
local a,b local a,b
for _, i in ipairs(HUES) do for _, i in ipairs(unifieddyes.HUES) do
a,b = string.find(name, "_"..i) a,b = string.find(name, "_"..i)
if a and not ( string.find(name, "_redviolet") and i == "red" ) then if a and not ( string.find(name, "_redviolet") and i == "red" ) then
hue = i hue = i
@ -573,7 +573,7 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
local oldnode = minetest.get_node(pos) local oldnode = minetest.get_node(pos)
local oldhue = nil local oldhue = nil
for _, i in ipairs(HUES) do for _, i in ipairs(unifieddyes.HUES) do
if string.find(oldnode.name, "_"..i) and not if string.find(oldnode.name, "_"..i) and not
( string.find(oldnode.name, "_redviolet") and i == "red" ) then ( string.find(oldnode.name, "_redviolet") and i == "red" ) then
oldhue = i oldhue = i
@ -588,18 +588,18 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
if oldhue ~=0 then -- it's colored, not grey if oldhue ~=0 then -- it's colored, not grey
if oldhue ~= nil then -- it's been painted before if oldhue ~= nil then -- it's been painted before
if hue ~= 0 then -- the player's wielding a colored dye if hue ~= 0 then -- the player's wielding a colored dye
newnode = string.gsub(newnode, "_"..oldhue, "_"..HUES[hue]) newnode = string.gsub(newnode, "_"..oldhue, "_"..unifieddyes.HUES[hue])
else -- it's a greyscale dye else -- it's a greyscale dye
newnode = string.gsub(newnode, "_"..oldhue, "_grey") newnode = string.gsub(newnode, "_"..oldhue, "_grey")
end end
else -- it's never had a color at all else -- it's never had a color at all
if hue ~= 0 then -- and if the wield is greyscale, don't change the node name if hue ~= 0 then -- and if the wield is greyscale, don't change the node name
newnode = string.gsub(newnode, "_grey", "_"..HUES[hue]) newnode = string.gsub(newnode, "_grey", "_"..unifieddyes.HUES[hue])
end end
end end
else else
if hue ~= 0 then -- greyscale dye on greyscale node = no hue change if hue ~= 0 then -- greyscale dye on greyscale node = no hue change
newnode = string.gsub(newnode, "_grey", "_"..HUES[hue]) newnode = string.gsub(newnode, "_grey", "_"..unifieddyes.HUES[hue])
end end
end end
node.param2 = paletteidx + (minetest.get_node(pos).param2 % 32) node.param2 = paletteidx + (minetest.get_node(pos).param2 % 32)
@ -621,12 +621,12 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
elseif palette_type == true then -- it's colorfacedir elseif palette_type == true then -- it's colorfacedir
if oldhue then if oldhue then
if hue ~= 0 then if hue ~= 0 then
newnode.name = string.gsub(newnode.name, "_"..oldhue, "_"..HUES[hue]) newnode.name = string.gsub(newnode.name, "_"..oldhue, "_"..unifieddyes.HUES[hue])
else else
newnode.name = string.gsub(newnode.name, "_"..oldhue, "_grey") newnode.name = string.gsub(newnode.name, "_"..oldhue, "_grey")
end end
elseif string.find(minetest.get_node(pos).name, "_grey") and hue ~= 0 then elseif string.find(minetest.get_node(pos).name, "_grey") and hue ~= 0 then
newnode.name = string.gsub(newnode.name, "_grey", "_"..HUES[hue]) newnode.name = string.gsub(newnode.name, "_grey", "_"..unifieddyes.HUES[hue])
end end
newnode.param2 = paletteidx + (minetest.get_node(pos).param2 % 32) newnode.param2 = paletteidx + (minetest.get_node(pos).param2 % 32)
else -- it's the 89-color palette, or the extended palette else -- it's the 89-color palette, or the extended palette
@ -669,12 +669,12 @@ unifieddyes.convert_classic_palette = {
for hue = 0, 11 do for hue = 0, 11 do
-- light -- light
local paletteidx = unifieddyes.getpaletteidx("dye:light_"..HUES[hue+1], false) local paletteidx = unifieddyes.getpaletteidx("dye:light_"..unifieddyes.HUES[hue+1], false)
unifieddyes.convert_classic_palette[paletteidx] = hue*2 + 48 unifieddyes.convert_classic_palette[paletteidx] = hue*2 + 48
for sat = 0, 1 do for sat = 0, 1 do
for val = 0, 2 do for val = 0, 2 do
-- all other shades -- all other shades
local paletteidx = unifieddyes.getpaletteidx("dye:"..VALS[val+1]..HUES[hue+1]..SATS[sat+1], false) local paletteidx = unifieddyes.getpaletteidx("dye:"..unifieddyes.VALS[val+1]..unifieddyes.HUES[hue+1]..unifieddyes.SATS[sat+1], false)
unifieddyes.convert_classic_palette[paletteidx] = hue*2 + sat*24 + (val*48+96) unifieddyes.convert_classic_palette[paletteidx] = hue*2 + sat*24 + (val*48+96)
end end
end end
@ -682,14 +682,14 @@ end
-- Generate all dyes that are not part of the default minetest_game dyes mod -- Generate all dyes that are not part of the default minetest_game dyes mod
for _, h in ipairs(HUES_EXTENDED) do for _, h in ipairs(unifieddyes.HUES_EXTENDED) do
local hue = h[1] local hue = h[1]
local r = h[2] local r = h[2]
local g = h[3] local g = h[3]
local b = h[4] local b = h[4]
for v = 0, 6 do for v = 0, 6 do
local val = VALS_EXTENDED[v+1] local val = unifieddyes.VALS_EXTENDED[v+1]
local factor = 40 local factor = 40
if v > 4 then factor = 75 end if v > 4 then factor = 75 end
@ -868,8 +868,8 @@ minetest.register_craft( {
for i = 1, 12 do for i = 1, 12 do
local hue = HUES[i] local hue = unifieddyes.HUES[i]
local hue2 = HUES[i]:gsub("%a", string.upper, 1) local hue2 = unifieddyes.HUES[i]:gsub("%a", string.upper, 1)
if hue == "skyblue" then if hue == "skyblue" then
hue2 = "Sky Blue" hue2 = "Sky Blue"