From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 3 Jun 2012 21:14:45 +0000 (+0300)
Subject: Fire visualization in furnace menu
X-Git-Tag: 0.4.dev-20120603
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fcaacdb4ad261a8fb44837d22d2069c279219b9e;p=oweals%2Fminetest_game.git

Fire visualization in furnace menu
---

diff --git a/mods/default/init.lua b/mods/default/init.lua
index ff82e3af..b624b060 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -1268,6 +1268,14 @@ minetest.register_node("default:chest_locked", {
 	end,
 })
 
+default.furnace_inactive_formspec =
+	"invsize[8,9;]"..
+	"image[2,2;1,1;default_furnace_fire_bg.png]"..
+	"list[current_name;fuel;2,3;1,1;]"..
+	"list[current_name;src;2,1;1,1;]"..
+	"list[current_name;dst;5,1;2,2;]"..
+	"list[current_player;main;0,5;8,4;]"
+
 minetest.register_node("default:furnace", {
 	description = "Furnace",
 	tile_images = {"default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png",
@@ -1278,12 +1286,7 @@ minetest.register_node("default:furnace", {
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.env:get_meta(pos)
-		meta:set_string("formspec",
-			"invsize[8,9;]"..
-			"list[current_name;fuel;2,3;1,1;]"..
-			"list[current_name;src;2,1;1,1;]"..
-			"list[current_name;dst;5,1;2,2;]"..
-			"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec", default.furnace_inactive_formspec)
 		meta:set_string("infotext", "Furnace")
 		local inv = meta:get_inventory()
 		inv:set_size("fuel", 1)
@@ -1306,7 +1309,7 @@ minetest.register_node("default:furnace", {
 
 minetest.register_node("default:furnace_active", {
 	description = "Furnace",
-	tile_images = {"default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png",
+	tile_images = {"default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png",
 		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front_active.png"},
 	paramtype2 = "facedir",
 	light_source = 8,
@@ -1316,12 +1319,7 @@ minetest.register_node("default:furnace_active", {
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.env:get_meta(pos)
-		meta:set_string("formspec",
-			"invsize[8,9;]"..
-			"list[current_name;fuel;2,3;1,1;]"..
-			"list[current_name;src;2,1;1,1;]"..
-			"list[current_name;dst;5,1;2,2;]"..
-			"list[current_player;main;0,5;8,4;]")
+		meta:set_string("formspec", default.furnace_inactive_formspec)
 		meta:set_string("infotext", "Furnace");
 		local inv = meta:get_inventory()
 		inv:set_size("fuel", 1)
@@ -1405,8 +1403,18 @@ minetest.register_abm({
 		end
 		
 		if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
-			meta:set_string("infotext","Furnace active: "..(meta:get_float("fuel_time")/meta:get_float("fuel_totaltime")*100).."%")
+			local percent = math.floor(meta:get_float("fuel_time") /
+					meta:get_float("fuel_totaltime") * 100)
+			meta:set_string("infotext","Furnace active: "..percent.."%")
 			hacky_swap_node(pos,"default:furnace_active")
+			meta:set_string("formspec",
+				"invsize[8,9;]"..
+				"image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:"..
+						(100-percent)..":default_furnace_fire_fg.png]"..
+				"list[current_name;fuel;2,3;1,1;]"..
+				"list[current_name;src;2,1;1,1;]"..
+				"list[current_name;dst;5,1;2,2;]"..
+				"list[current_player;main;0,5;8,4;]")
 			return
 		end
 
@@ -1425,6 +1433,7 @@ minetest.register_abm({
 		if fuel.time <= 0 then
 			meta:set_string("infotext","Furnace out of fuel")
 			hacky_swap_node(pos,"default:furnace")
+			meta:set_string("formspec", default.furnace_inactive_formspec)
 			return
 		end
 
@@ -1432,6 +1441,7 @@ minetest.register_abm({
 			if was_active then
 				meta:set_string("infotext","Furnace is empty")
 				hacky_swap_node(pos,"default:furnace")
+				meta:set_string("formspec", default.furnace_inactive_formspec)
 			end
 			return
 		end
diff --git a/mods/default/textures/default_furnace_fire_bg.png b/mods/default/textures/default_furnace_fire_bg.png
new file mode 100644
index 00000000..1272e101
Binary files /dev/null and b/mods/default/textures/default_furnace_fire_bg.png differ
diff --git a/mods/default/textures/default_furnace_fire_fg.png b/mods/default/textures/default_furnace_fire_fg.png
new file mode 100644
index 00000000..fbb19df7
Binary files /dev/null and b/mods/default/textures/default_furnace_fire_fg.png differ