candles now use [multiply for colour, _de translation added (thx mrun…

…creative)
minetest-mirrors · Nov 25, 2024 · a23ef03 · a23ef03
1 parent c1a5303
commit a23ef03
Show file tree

Hide file tree

Showing 38 changed files with 62 additions and 17 deletions.
diff --git 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
@@ -188,23 +188,40 @@ minetest.register_craft({
 
 -- candle helper function
 
-local function add_candle(col, dcol)
+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 rcol = ""
+local function add_candle(col, dcol)
 
-	if col ~= "" then
-		rcol = col
-		col = "_" .. col
-	end
+	local under = "" ; if dcol ~= "" then under = "_" 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
@@ -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
@@ -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
diff --git a/textures/ethereal_candle_base.png b/textures/ethereal_candle_base.png
diff --git a/textures/ethereal_candle_base_inv.png b/textures/ethereal_candle_base_inv.png
diff --git a/textures/ethereal_candle_black.png b/textures/ethereal_candle_black.png
diff --git a/textures/ethereal_candle_black_static.png b/textures/ethereal_candle_black_static.png
diff --git a/textures/ethereal_candle_blue.png b/textures/ethereal_candle_blue.png
diff --git a/textures/ethereal_candle_blue_static.png b/textures/ethereal_candle_blue_static.png
diff --git a/textures/ethereal_candle_brown.png b/textures/ethereal_candle_brown.png
diff --git a/textures/ethereal_candle_brown_static.png b/textures/ethereal_candle_brown_static.png
diff --git a/textures/ethereal_candle_cyan.png b/textures/ethereal_candle_cyan.png
diff --git a/textures/ethereal_candle_cyan_static.png b/textures/ethereal_candle_cyan_static.png
diff --git a/textures/ethereal_candle_dark_green.png b/textures/ethereal_candle_dark_green.png
diff --git a/textures/ethereal_candle_dark_green_static.png b/textures/ethereal_candle_dark_green_static.png
diff --git a/textures/ethereal_candle_dark_grey.png b/textures/ethereal_candle_dark_grey.png
diff --git a/textures/ethereal_candle_dark_grey_static.png b/textures/ethereal_candle_dark_grey_static.png
diff --git a/textures/ethereal_candle_flame.png b/textures/ethereal_candle_flame.png
diff --git a/textures/ethereal_candle_flame_inv.png b/textures/ethereal_candle_flame_inv.png
diff --git a/textures/ethereal_candle_green.png b/textures/ethereal_candle_green.png
diff --git a/textures/ethereal_candle_green_static.png b/textures/ethereal_candle_green_static.png
diff --git a/textures/ethereal_candle_grey.png b/textures/ethereal_candle_grey.png
diff --git a/textures/ethereal_candle_grey_static.png b/textures/ethereal_candle_grey_static.png
diff --git a/textures/ethereal_candle_magenta.png b/textures/ethereal_candle_magenta.png
diff --git a/textures/ethereal_candle_magenta_static.png b/textures/ethereal_candle_magenta_static.png
diff --git a/textures/ethereal_candle_orange.png b/textures/ethereal_candle_orange.png
diff --git a/textures/ethereal_candle_orange_static.png b/textures/ethereal_candle_orange_static.png
diff --git a/textures/ethereal_candle_pink.png b/textures/ethereal_candle_pink.png
diff --git a/textures/ethereal_candle_pink_static.png b/textures/ethereal_candle_pink_static.png
diff --git a/textures/ethereal_candle_red.png b/textures/ethereal_candle_red.png
diff --git a/textures/ethereal_candle_red_static.png b/textures/ethereal_candle_red_static.png
diff --git a/textures/ethereal_candle_static.png b/textures/ethereal_candle_static.png
diff --git a/textures/ethereal_candle_violet.png b/textures/ethereal_candle_violet.png
diff --git a/textures/ethereal_candle_violet_static.png b/textures/ethereal_candle_violet_static.png
diff --git a/textures/ethereal_candle_yellow.png b/textures/ethereal_candle_yellow.png
diff --git a/textures/ethereal_candle_yellow_static.png b/textures/ethereal_candle_yellow_static.png