1
0
mirror of https://github.com/mt-mods/unifieddyes.git synced 2024-12-24 17:50:29 +01:00

fix incorrect handling of "azure" re: wallmounted palette

(it doesn't exist there :P  replaced with light blue)
also fixed missing craft helper recipe for same
and fixed missing light_red in color<->palette table.
This commit is contained in:
Vanessa Dannenberg 2018-09-08 11:21:00 -04:00
parent 8fbd9cd23b
commit 0413f23df1

View File

@ -276,7 +276,8 @@ function unifieddyes.register_color_craft(craft)
if craft.palette == "wallmounted" then if craft.palette == "wallmounted" then
register_c(craft, "green", "", "light_") register_c(craft, "green", "", "light_")
register_c(craft, "azure", "", "") register_c(craft, "blue", "", "light_")
register_c(craft, "pink", "", "")
hues_table = unifieddyes.HUES_WALLMOUNTED hues_table = unifieddyes.HUES_WALLMOUNTED
sats_table = {""} sats_table = {""}
vals_table = unifieddyes.VALS vals_table = unifieddyes.VALS
@ -594,7 +595,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
if color == "green" and shade == "light" then return 48,3 if color == "green" and shade == "light" then return 48,3
elseif color == "brown" then return 17,1 elseif color == "brown" then return 17,1
elseif color == "pink" then return 56,7 elseif color == "pink" then return 56,7
elseif color == "azure" then return 40,5 elseif color == "blue" and shade == "light" then return 40,5
elseif hues_wallmounted[color] and shades_wallmounted[shade] then elseif hues_wallmounted[color] and shades_wallmounted[shade] then
return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color] return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color]
end end
@ -1021,7 +1022,6 @@ function unifieddyes.show_airbrush_form(player)
t[#t+1] = color_button_size t[#t+1] = color_button_size
t[#t+1] = selindic t[#t+1] = selindic
if painting_with then if painting_with then
t[#t+1] = "label[12.6," t[#t+1] = "label[12.6,"
t[#t+1] = (vps*5.02+vs) t[#t+1] = (vps*5.02+vs)
@ -1342,6 +1342,8 @@ for _, palette in ipairs({"extended", "old89", "wallmounted"}) do
end end
end end
unifieddyes.palette_has_color["wallmounted_light_red"] = true
-- crafting! -- crafting!
unifieddyes.base_color_crafts = { unifieddyes.base_color_crafts = {