diff --git a/README.md b/README.md index 9d3bc9e..2a08500 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,7 @@ who helped make this mod bigger and better throughout it's release :) - Add 'ethereal.old_biomes' setting to stay with older biome settings and not use the new layout for compatibility if wanted. - Update settings. + - Candles use [multiply for colour. ### 1.31 - Fix fishing biome checks diff --git a/extra.lua b/extra.lua index 2b1fdbd..8ff8a98 100644 --- a/extra.lua +++ b/extra.lua @@ -188,23 +188,40 @@ minetest.register_craft({ -- candle helper function +local candle_colors = { + [""] = "F7F2CD", + ["black"] = "40403F", + ["blue"] = "5587B4", + ["brown"] = "6D4728", + ["cyan"] = "78F1B1", + ["dark_green"] = "23AF23", + ["dark_grey"] = "868178", + ["green"] = "96CA32", + ["grey"] = "C0BAAF", + ["magenta"] = "C22E7D", + ["orange"] = "E88817", + ["pink"] = "FA8B91", + ["red"] = "CF4727", + ["violet"] = "975EC0", + ["yellow"] = "FFF74D" +} + local function add_candle(col, dcol) - local rcol = "" + local under = "" ; if dcol ~= "" then under = "_" end - if col ~= "" then - rcol = col - col = "_" .. col - end - - minetest.register_node("ethereal:candle" .. col, { + minetest.register_node("ethereal:candle" .. under .. col, { description = S(dcol .. "Candle"), drawtype = "plantlike", - inventory_image = "ethereal_candle" .. col .. "_static.png", - wield_image = "ethereal_candle" .. col .. "_static.png", + + inventory_image = "ethereal_candle_base_inv.png^[multiply:#" + .. candle_colors[col] .. "70^ethereal_candle_flame_inv.png", + wield_image = "ethereal_candle_base_inv.png^[multiply:#" + .. candle_colors[col] .. "70^ethereal_candle_flame_inv.png", tiles = { { - name = "ethereal_candle" .. col .. ".png", + name = "ethereal_candle_base.png^[multiply:#" + .. candle_colors[col] .. "70^ethereal_candle_flame.png", animation = { type="vertical_frames", aspect_w = 32, aspect_h = 32, length = 1.0 } @@ -221,19 +238,16 @@ local function add_candle(col, dcol) } }) - if col ~= "" then - + if dcol ~= "" then minetest.register_craft({ - output = "ethereal:candle" .. col, - recipe = { - {"group:candle", "dye:" .. rcol}, - } + output = "ethereal:candle" .. under .. col, + recipe = { {"group:candle", "dye:" .. col} } }) end end add_candle("", "") -add_candle("black", "Black ") -- candle colour textures by wRothbard +add_candle("black", "Black ") add_candle("blue", "Blue ") add_candle("brown", "Brown ") add_candle("cyan", "Cyan ") diff --git a/locale/ethereal.de.tr b/locale/ethereal.de.tr index 6ed42d2..a430346 100644 --- a/locale/ethereal.de.tr +++ b/locale/ethereal.de.tr @@ -134,3 +134,18 @@ Birch Wood=Birkenholz Bamboo=Bambus Olive Trunk= Olive Wood= +Candle=Kerze +Black Candle=Schwarze Kerze +Blue Candle=Blaue Kerze +Brown Candle=Braune Kerze +Cyan Candle=Türkise Kerze +Dark Green Candle=Dunkelgrüne Kerze +Dark Grey Candle=Dunkelgraue Kerze +Green Candle=Grüne Kerze +Grey Candle=Graue Kerze +Magenta Candle=Magenta Kerze +Orange Candle=Orange Kerze +Pink Candle=Rosa Kerze +Red Candle=Rote Kerze +Violet Candle=Violette Kerze +Yellow Candle=Gelbe Kerze diff --git a/locale/template.txt b/locale/template.txt index dd58993..bb89dd7 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -135,3 +135,18 @@ Birch Wood= Bamboo= Olive Trunk= Olive Wood= +Candle= +Black Candle= +Blue Candle= +Brown Candle= +Cyan Candle= +Dark Green Candle= +Dark Grey Candle= +Green Candle= +Grey Candle= +Magenta Candle= +Orange Candle= +Pink Candle= +Red Candle= +Violet Candle= +Yellow Candle= diff --git a/textures/ethereal_candle.png b/textures/ethereal_candle.png deleted file mode 100644 index 0ed21b4..0000000 Binary files a/textures/ethereal_candle.png and /dev/null differ diff --git a/textures/ethereal_candle_base.png b/textures/ethereal_candle_base.png new file mode 100644 index 0000000..eb8d760 Binary files /dev/null and b/textures/ethereal_candle_base.png differ diff --git a/textures/ethereal_candle_base_inv.png b/textures/ethereal_candle_base_inv.png new file mode 100644 index 0000000..d2c8d30 Binary files /dev/null and b/textures/ethereal_candle_base_inv.png differ diff --git a/textures/ethereal_candle_black.png b/textures/ethereal_candle_black.png deleted file mode 100644 index 62ec1a1..0000000 Binary files a/textures/ethereal_candle_black.png and /dev/null differ diff --git a/textures/ethereal_candle_black_static.png b/textures/ethereal_candle_black_static.png deleted file mode 100644 index feb5279..0000000 Binary files a/textures/ethereal_candle_black_static.png and /dev/null differ diff --git a/textures/ethereal_candle_blue.png b/textures/ethereal_candle_blue.png deleted file mode 100644 index 5684d6c..0000000 Binary files a/textures/ethereal_candle_blue.png and /dev/null differ diff --git a/textures/ethereal_candle_blue_static.png b/textures/ethereal_candle_blue_static.png deleted file mode 100644 index 9b41d48..0000000 Binary files a/textures/ethereal_candle_blue_static.png and /dev/null differ diff --git a/textures/ethereal_candle_brown.png b/textures/ethereal_candle_brown.png deleted file mode 100644 index 260e1fd..0000000 Binary files a/textures/ethereal_candle_brown.png and /dev/null differ diff --git a/textures/ethereal_candle_brown_static.png b/textures/ethereal_candle_brown_static.png deleted file mode 100644 index 553b6bf..0000000 Binary files a/textures/ethereal_candle_brown_static.png and /dev/null differ diff --git a/textures/ethereal_candle_cyan.png b/textures/ethereal_candle_cyan.png deleted file mode 100644 index ba50b6f..0000000 Binary files a/textures/ethereal_candle_cyan.png and /dev/null differ diff --git a/textures/ethereal_candle_cyan_static.png b/textures/ethereal_candle_cyan_static.png deleted file mode 100644 index e3bf7f0..0000000 Binary files a/textures/ethereal_candle_cyan_static.png and /dev/null differ diff --git a/textures/ethereal_candle_dark_green.png b/textures/ethereal_candle_dark_green.png deleted file mode 100644 index 800ce60..0000000 Binary files a/textures/ethereal_candle_dark_green.png and /dev/null differ diff --git a/textures/ethereal_candle_dark_green_static.png b/textures/ethereal_candle_dark_green_static.png deleted file mode 100644 index de809e4..0000000 Binary files a/textures/ethereal_candle_dark_green_static.png and /dev/null differ diff --git a/textures/ethereal_candle_dark_grey.png b/textures/ethereal_candle_dark_grey.png deleted file mode 100644 index c22a540..0000000 Binary files a/textures/ethereal_candle_dark_grey.png and /dev/null differ diff --git a/textures/ethereal_candle_dark_grey_static.png b/textures/ethereal_candle_dark_grey_static.png deleted file mode 100644 index 229e8bf..0000000 Binary files a/textures/ethereal_candle_dark_grey_static.png and /dev/null differ diff --git a/textures/ethereal_candle_flame.png b/textures/ethereal_candle_flame.png new file mode 100644 index 0000000..4493200 Binary files /dev/null and b/textures/ethereal_candle_flame.png differ diff --git a/textures/ethereal_candle_flame_inv.png b/textures/ethereal_candle_flame_inv.png new file mode 100644 index 0000000..f6e736d Binary files /dev/null and b/textures/ethereal_candle_flame_inv.png differ diff --git a/textures/ethereal_candle_green.png b/textures/ethereal_candle_green.png deleted file mode 100644 index 19991d7..0000000 Binary files a/textures/ethereal_candle_green.png and /dev/null differ diff --git a/textures/ethereal_candle_green_static.png b/textures/ethereal_candle_green_static.png deleted file mode 100644 index 2707787..0000000 Binary files a/textures/ethereal_candle_green_static.png and /dev/null differ diff --git a/textures/ethereal_candle_grey.png b/textures/ethereal_candle_grey.png deleted file mode 100644 index 8ca60ff..0000000 Binary files a/textures/ethereal_candle_grey.png and /dev/null differ diff --git a/textures/ethereal_candle_grey_static.png b/textures/ethereal_candle_grey_static.png deleted file mode 100644 index c3c46aa..0000000 Binary files a/textures/ethereal_candle_grey_static.png and /dev/null differ diff --git a/textures/ethereal_candle_magenta.png b/textures/ethereal_candle_magenta.png deleted file mode 100644 index 70808e0..0000000 Binary files a/textures/ethereal_candle_magenta.png and /dev/null differ diff --git a/textures/ethereal_candle_magenta_static.png b/textures/ethereal_candle_magenta_static.png deleted file mode 100644 index 98a1621..0000000 Binary files a/textures/ethereal_candle_magenta_static.png and /dev/null differ diff --git a/textures/ethereal_candle_orange.png b/textures/ethereal_candle_orange.png deleted file mode 100644 index f6f0589..0000000 Binary files a/textures/ethereal_candle_orange.png and /dev/null differ diff --git a/textures/ethereal_candle_orange_static.png b/textures/ethereal_candle_orange_static.png deleted file mode 100644 index 62a531e..0000000 Binary files a/textures/ethereal_candle_orange_static.png and /dev/null differ diff --git a/textures/ethereal_candle_pink.png b/textures/ethereal_candle_pink.png deleted file mode 100644 index 9606fd9..0000000 Binary files a/textures/ethereal_candle_pink.png and /dev/null differ diff --git a/textures/ethereal_candle_pink_static.png b/textures/ethereal_candle_pink_static.png deleted file mode 100644 index 3d6ebcc..0000000 Binary files a/textures/ethereal_candle_pink_static.png and /dev/null differ diff --git a/textures/ethereal_candle_red.png b/textures/ethereal_candle_red.png deleted file mode 100644 index ffdafc0..0000000 Binary files a/textures/ethereal_candle_red.png and /dev/null differ diff --git a/textures/ethereal_candle_red_static.png b/textures/ethereal_candle_red_static.png deleted file mode 100644 index 283930d..0000000 Binary files a/textures/ethereal_candle_red_static.png and /dev/null differ diff --git a/textures/ethereal_candle_static.png b/textures/ethereal_candle_static.png deleted file mode 100644 index d907192..0000000 Binary files a/textures/ethereal_candle_static.png and /dev/null differ diff --git a/textures/ethereal_candle_violet.png b/textures/ethereal_candle_violet.png deleted file mode 100644 index 611a019..0000000 Binary files a/textures/ethereal_candle_violet.png and /dev/null differ diff --git a/textures/ethereal_candle_violet_static.png b/textures/ethereal_candle_violet_static.png deleted file mode 100644 index 1ca289d..0000000 Binary files a/textures/ethereal_candle_violet_static.png and /dev/null differ diff --git a/textures/ethereal_candle_yellow.png b/textures/ethereal_candle_yellow.png deleted file mode 100644 index 2e86aef..0000000 Binary files a/textures/ethereal_candle_yellow.png and /dev/null differ diff --git a/textures/ethereal_candle_yellow_static.png b/textures/ethereal_candle_yellow_static.png deleted file mode 100644 index 115ff7a..0000000 Binary files a/textures/ethereal_candle_yellow_static.png and /dev/null differ