1
0
mirror of https://github.com/mt-mods/unifieddyes.git synced 2024-11-15 06:40:17 +01:00

Merge branch 'patch-1' into 'master'

Fix numbers relating to greys

See merge request VanessaE/unifieddyes!1
This commit is contained in:
Vanessa Dannenberg 2018-12-16 00:09:21 +00:00
commit 5039a8ce07

View File

@ -128,7 +128,7 @@ unifieddyes.GREYS = {
unifieddyes.GREYS_EXTENDED = table.copy(unifieddyes.GREYS) unifieddyes.GREYS_EXTENDED = table.copy(unifieddyes.GREYS)
for i = 1, 14 do for i = 1, 14 do
if i ~= 0 and i ~= 3 and i ~= 7 and i ~= 11 and i ~= 15 then if i ~= 0 and i ~= 4 and i ~= 8 and i ~= 11 and i ~= 15 then
table.insert(unifieddyes.GREYS_EXTENDED, "grey_"..i) table.insert(unifieddyes.GREYS_EXTENDED, "grey_"..i)
end end
end end
@ -449,7 +449,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
["grey_14"] = 1, ["grey_14"] = 1,
["grey_13"] = 2, ["grey_13"] = 2,
["grey_12"] = 3, ["grey_12"] = 3,
["light_grey"] = 3, ["light_grey"] = 4,
["grey_11"] = 4, ["grey_11"] = 4,
["grey_10"] = 5, ["grey_10"] = 5,
["grey_9"] = 6, ["grey_9"] = 6,