From 636b0f20df4fef3eef821c23ccc2f606828f5c6f Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Mon, 07 Jul 2014 15:15:05 +0200
Subject: [PATCH] Handheld prospecting tool

---
 technic/tools/cans.lua |   50 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/technic/tools/cans.lua b/technic/tools/cans.lua
index e95b144..f1a821b 100644
--- a/technic/tools/cans.lua
+++ b/technic/tools/cans.lua
@@ -1,12 +1,14 @@
 local water_can_max_load = 16
 local lava_can_max_load = 8
 
+local S = technic.getter
+
 minetest.register_craft({
 	output = 'technic:water_can 1',
 	recipe = {
 		{'technic:zinc_ingot', 'technic:rubber','technic:zinc_ingot'},
-		{'default:steel_ingot', '', 'default:steel_ingot'},
-		{'technic:zinc_ingot', 'default:steel_ingot', 'technic:zinc_ingot'},
+		{'technic:carbon_steel_ingot', '', 'technic:carbon_steel_ingot'},
+		{'technic:zinc_ingot', 'technic:carbon_steel_ingot', 'technic:zinc_ingot'},
 	}
 })
 
@@ -19,11 +21,23 @@
 	}
 })
 
+local function set_can_wear(itemstack, level, max_level)
+	local temp
+	if level == 0 then
+		temp = 0
+	else
+		temp = 65536 - math.floor(level / max_level * 65535)
+		if temp > 65535 then temp = 65535 end
+		if temp < 1 then temp = 1 end
+	end
+	itemstack:set_wear(temp)
+end
 
 minetest.register_tool("technic:water_can", {
-	description = "Water Can",
+	description = S("Water Can"),
 	inventory_image = "technic_water_can.png",
 	stack_max = 1,
+	wear_represents = "content_level",
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type ~= "node" then
@@ -38,11 +52,11 @@
 			charge = tonumber(itemstack:get_metadata())
 		end
 		if node.name == "default:water_source" then
-			if charge + 1 < 17 then
+			if charge < water_can_max_load then
 				minetest.remove_node(pointed_thing.under)
 				charge = charge + 1
 				itemstack:set_metadata(tostring(charge))
-				technic.set_RE_wear(itemstack, charge, water_can_max_load)
+				set_can_wear(itemstack, charge, water_can_max_load)
 			end
 			return itemstack
 		end
@@ -54,7 +68,7 @@
 			minetest.set_node(pointed_thing.under, {name="default:water_source"})
 			charge = charge - 1
 			itemstack:set_metadata(tostring(charge))
-			technic.set_RE_wear(itemstack, charge, water_can_max_load)
+			set_can_wear(itemstack, charge, water_can_max_load)
 			return itemstack
 		end
 
@@ -63,16 +77,22 @@
 			minetest.set_node(pointed_thing.above, {name="default:water_source"})
 			charge = charge - 1;
 			itemstack:set_metadata(tostring(charge))
-			technic.set_RE_wear(itemstack, charge, water_can_max_load)
+			set_can_wear(itemstack, charge, water_can_max_load)
 			return itemstack
 		end		
+	end,
+	on_refill = function(stack)
+		stack:set_metadata(tostring(water_can_max_load))
+		set_can_wear(stack, water_can_max_load, water_can_max_load)
+		return stack
 	end,
 })
 
 minetest.register_tool("technic:lava_can", {
-	description = "Lava Can",
+	description = S("Lava Can"),
 	inventory_image = "technic_lava_can.png",
 	stack_max = 1,
+	wear_represents = "content_level",
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type ~= "node" then
@@ -87,11 +107,11 @@
 		end
 
 		if node.name == "default:lava_source" then
-			if charge + 1 < 17 then
+			if charge < lava_can_max_load then
 				minetest.remove_node(pointed_thing.under)
 				charge = charge + 1
 				itemstack:set_metadata(tostring(charge))
-				technic.set_RE_wear(itemstack, charge, lava_can_max_load)
+				set_can_wear(itemstack, charge, lava_can_max_load)
 			end
 			return itemstack
 		end
@@ -103,7 +123,7 @@
 			minetest.set_node(pointed_thing.under, {name="default:lava_source"})
 			charge = charge - 1	
 			itemstack:set_metadata(tostring(charge))
-			technic.set_RE_wear(itemstack, charge, lava_can_max_load)
+			set_can_wear(itemstack, charge, lava_can_max_load)
 			return itemstack
 		end
 
@@ -112,8 +132,14 @@
 			minetest.set_node(pointed_thing.above, {name="default:lava_source"})
 			charge = charge - 1
 			itemstack:set_metadata(tostring(charge))
-			technic.set_RE_wear(itemstack, charge, lava_can_max_load)
+			set_can_wear(itemstack, charge, lava_can_max_load)
 			return itemstack
 		end
 	end,
+	on_refill = function(stack)
+		stack:set_metadata(tostring(lava_can_max_load))
+		set_can_wear(stack, lava_can_max_load, lava_can_max_load)
+		return stack
+	end,
 })
+

--
Gitblit v1.8.0