diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index e2275cac..40a94ae4 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -371,12 +371,12 @@ local repl = { off="low", low="med", med="hi", hi="max", max="off", } local brights_tab = { 0, 50, 100, 150, 200 } local lamp_colors = { - "", - "blue", - "green", - "pink", - "red", - "violet" + {"white", "#ffffffe0:175"}, + {"blue", "#2626c6e0:200"}, + {"green", "#27a927e0:200"}, + {"pink", "#ff8fb7e0:200"}, + {"red", "#ad2323e0:200"}, + {"violet", "#7f29d7e0:200"} } local tlamp_cbox = { @@ -390,9 +390,10 @@ local slamp_cbox = { } local function reg_lamp(suffix, nxt, tilesuffix, light, color) - local lampcolor = "_"..color - local colordesc = " ("..color..")" - local woolcolor = color + local lampcolor = "_"..color[1] + local colordesc = " ("..color[1]..")" + local woolcolor = color[1] + local invcolor = color[2] local wool_brighten = (light or 0) * 7 local bulb_brighten = (light or 0) * 14 @@ -411,7 +412,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) "homedecor_generic_wood_red.png", "homedecor_generic_metal_black.png^[brighten", }, - inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png", + inventory_image = "homedecor_table_lamp_foot_inv.png^(homedecor_table_lamp_top_inv.png^[colorize:"..invcolor..")", walkable = false, light_source = light, selection_box = tlamp_cbox, @@ -437,7 +438,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) "homedecor_generic_wood_red.png", "homedecor_generic_metal_black.png^[brighten", }, - inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png", + inventory_image = "homedecor_standing_lamp_foot_inv.png^(homedecor_standing_lamp_top_inv.png^[colorize:"..invcolor..")", walkable = false, light_source = light, groups = {cracky=2,oddly_breakable_by_hand=1, diff --git a/homedecor/textures/homedecor_standing_lamp_blue_inv.png b/homedecor/textures/homedecor_standing_lamp_blue_inv.png deleted file mode 100644 index 180262b7..00000000 Binary files a/homedecor/textures/homedecor_standing_lamp_blue_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_standing_lamp_foot_inv.png b/homedecor/textures/homedecor_standing_lamp_foot_inv.png new file mode 100644 index 00000000..6606a2b2 Binary files /dev/null and b/homedecor/textures/homedecor_standing_lamp_foot_inv.png differ diff --git a/homedecor/textures/homedecor_standing_lamp_green_inv.png b/homedecor/textures/homedecor_standing_lamp_green_inv.png deleted file mode 100644 index 803ed183..00000000 Binary files a/homedecor/textures/homedecor_standing_lamp_green_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_standing_lamp_inv.png b/homedecor/textures/homedecor_standing_lamp_inv.png deleted file mode 100644 index c0b0b569..00000000 Binary files a/homedecor/textures/homedecor_standing_lamp_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_standing_lamp_pink_inv.png b/homedecor/textures/homedecor_standing_lamp_pink_inv.png deleted file mode 100644 index a3956919..00000000 Binary files a/homedecor/textures/homedecor_standing_lamp_pink_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_standing_lamp_red_inv.png b/homedecor/textures/homedecor_standing_lamp_red_inv.png deleted file mode 100644 index 08b11c87..00000000 Binary files a/homedecor/textures/homedecor_standing_lamp_red_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_standing_lamp_top_inv.png b/homedecor/textures/homedecor_standing_lamp_top_inv.png new file mode 100644 index 00000000..2190d2ad Binary files /dev/null and b/homedecor/textures/homedecor_standing_lamp_top_inv.png differ diff --git a/homedecor/textures/homedecor_standing_lamp_violet_inv.png b/homedecor/textures/homedecor_standing_lamp_violet_inv.png deleted file mode 100644 index c1d8938c..00000000 Binary files a/homedecor/textures/homedecor_standing_lamp_violet_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_table_lamp_blue_inv.png b/homedecor/textures/homedecor_table_lamp_blue_inv.png deleted file mode 100644 index dae4c1cd..00000000 Binary files a/homedecor/textures/homedecor_table_lamp_blue_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_table_lamp_foot_inv.png b/homedecor/textures/homedecor_table_lamp_foot_inv.png new file mode 100644 index 00000000..af5ff823 Binary files /dev/null and b/homedecor/textures/homedecor_table_lamp_foot_inv.png differ diff --git a/homedecor/textures/homedecor_table_lamp_green_inv.png b/homedecor/textures/homedecor_table_lamp_green_inv.png deleted file mode 100644 index 7b888da9..00000000 Binary files a/homedecor/textures/homedecor_table_lamp_green_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_table_lamp_inv.png b/homedecor/textures/homedecor_table_lamp_inv.png deleted file mode 100644 index 7c43d96a..00000000 Binary files a/homedecor/textures/homedecor_table_lamp_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_table_lamp_pink_inv.png b/homedecor/textures/homedecor_table_lamp_pink_inv.png deleted file mode 100644 index b5d31abe..00000000 Binary files a/homedecor/textures/homedecor_table_lamp_pink_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_table_lamp_red_inv.png b/homedecor/textures/homedecor_table_lamp_red_inv.png deleted file mode 100644 index d510f994..00000000 Binary files a/homedecor/textures/homedecor_table_lamp_red_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_table_lamp_top_inv.png b/homedecor/textures/homedecor_table_lamp_top_inv.png new file mode 100644 index 00000000..ce657653 Binary files /dev/null and b/homedecor/textures/homedecor_table_lamp_top_inv.png differ diff --git a/homedecor/textures/homedecor_table_lamp_violet_inv.png b/homedecor/textures/homedecor_table_lamp_violet_inv.png deleted file mode 100644 index 49e646eb..00000000 Binary files a/homedecor/textures/homedecor_table_lamp_violet_inv.png and /dev/null differ