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/machines/HV/forcefield.lua |   70 ++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua
index dd9f8ef..32a93fc 100644
--- a/technic/machines/HV/forcefield.lua
+++ b/technic/machines/HV/forcefield.lua
@@ -9,6 +9,8 @@
 local forcefield_power_drain   = 10
 local forcefield_step_interval = 1
 
+local S = technic.getter
+
 minetest.register_craft({
 	output = 'technic:forcefield_emitter_off',
 	recipe = {
@@ -60,35 +62,34 @@
 	vm:update_map()
 end
 
-local get_forcefield_formspec = function(range)
-	return "size[3,1.5]"..
-		"field[1,0.5;2,1;range;Range;"..range.."]"..
-		"button[0,1;3,1;toggle;Enable/Disable]"
+local function set_forcefield_formspec(meta)
+	local formspec = "size[5,1.5]"..
+		"field[2,0.5;2,1;range;"..S("Range")..";"..meta:get_int("range").."]"
+	if meta:get_int("enabled") == 0 then
+		formspec = formspec.."button[0,1;5,1;enable;"..S("%s Disabled"):format(S("%s Forcefield Emitter"):format("HV")).."]"
+	else
+		formspec = formspec.."button[0,1;5,1;disable;"..S("%s Enabled"):format(S("%s Forcefield Emitter"):format("HV")).."]"
+	end
+	meta:set_string("formspec", formspec)
 end
 
 local forcefield_receive_fields = function(pos, formname, fields, sender)
 	local meta = minetest.get_meta(pos)
-	local range = tonumber(fields.range) or 0
-
-	if fields.toggle then
-		if meta:get_int("enabled") == 1 then
-		   meta:set_int("enabled", 0)
-		else
-		   meta:set_int("enabled", 1)
+	if fields.range then
+		local range = tonumber(fields.range) or 0
+		-- Smallest field is 5. Anything less is asking for trouble.
+		-- Largest is 20. It is a matter of pratical node handling.
+		-- At the maximim range updating the forcefield takes about 0.2s
+		range = math.max(range, 5)
+		range = math.min(range, 20)
+		if meta:get_int("range") ~= range then
+			update_forcefield(pos, meta:get_int("range"), false)
+			meta:set_int("range", range)
 		end
 	end
-
-	-- Smallest field is 5. Anything less is asking for trouble.
-	-- Largest is 20. It is a matter of pratical node handling.
-	-- At the maximim range updating the forcefield takes about 0.2s
-	range = math.max(range, 5)
-	range = math.min(range, 20)
-
-	if meta:get_int("range") ~= range then
-		update_forcefield(pos, meta:get_int("range"), false)
-		meta:set_int("range", range)
-		meta:set_string("formspec", get_forcefield_formspec(range))
-	end
+	if fields.enable then meta:set_int("enabled", 1) end
+	if fields.disable then meta:set_int("enabled", 0) end
+	set_forcefield_formspec(meta)
 end
 
 local mesecons = {
@@ -103,7 +104,7 @@
 }
 
 minetest.register_node("technic:forcefield_emitter_off", {
-	description = "Forcefield emitter",
+	description = S("%s Forcefield Emitter"):format("HV"),
 	tiles = {"technic_forcefield_emitter_off.png"},
 	groups = {cracky = 1},
 	on_receive_fields = forcefield_receive_fields,
@@ -113,14 +114,14 @@
 		meta:set_int("HV_EU_demand", 0)
 		meta:set_int("range", 10)
 		meta:set_int("enabled", 0)
-		meta:set_string("formspec", get_forcefield_formspec(10))
-		meta:set_string("infotext", "Forcefield emitter");
+		meta:set_string("infotext", S("%s Forcefield Emitter"):format("HV"))
+		set_forcefield_formspec(meta)
 	end,
 	mesecons = mesecons
 })
 
 minetest.register_node("technic:forcefield_emitter_on", {
-	description = "Forcefield emitter on (you hacker you)",
+	description = S("%s Forcefield Emitter"):format("HV"),
 	tiles = {"technic_forcefield_emitter_on.png"},
 	groups = {cracky = 1, not_in_creative_inventory=1},
 	drop = "technic:forcefield_emitter_off",
@@ -138,7 +139,7 @@
 })
 
 minetest.register_node("technic:forcefield", {
-	description = "Forcefield (you hacker you)",
+	description = S("%s Forcefield"):format("HV"),
 	sunlight_propagates = true,
 	drawtype = "glasslike",
 	groups = {not_in_creative_inventory=1, unbreakable=1},
@@ -164,6 +165,7 @@
 		local eu_input   = meta:get_int("HV_EU_input")
 		local eu_demand  = meta:get_int("HV_EU_demand")
 		local enabled    = meta:get_int("enabled")
+		local machine_name = S("%s Forcefield Emitter"):format("HV")
 		-- Power off automatically if no longer connected to a switching station
 		technic.switching_station_timeout_count(pos, "HV")
 
@@ -175,20 +177,20 @@
 			if node.name == "technic:forcefield_emitter_on" then
 				meta:set_int("HV_EU_demand", 0)
 				update_forcefield(pos, meta:get_int("range"), false)
-				hacky_swap_node(pos, "technic:forcefield_emitter_off")
-				meta:set_string("infotext", "Forcefield Generator Disabled")
+				technic.swap_node(pos, "technic:forcefield_emitter_off")
+				meta:set_string("infotext", S("%s Disabled"):format(machine_name))
 				return
 			end
 		elseif eu_input < power_requirement then
-			meta:set_string("infotext", "Forcefield Generator Unpowered")
+			meta:set_string("infotext", S("%s Unpowered"):format(machine_name))
 			if node.name == "technic:forcefield_emitter_on" then
 				update_forcefield(pos, meta:get_int("range"), false)
-				hacky_swap_node(pos, "technic:forcefield_emitter_off")
+				technic.swap_node(pos, "technic:forcefield_emitter_off")
 			end
 		elseif eu_input >= power_requirement then
 			if node.name == "technic:forcefield_emitter_off" then
-				hacky_swap_node(pos, "technic:forcefield_emitter_on")
-				meta:set_string("infotext", "Forcefield Generator Active")
+				technic.swap_node(pos, "technic:forcefield_emitter_on")
+				meta:set_string("infotext", S("%s Active"):format(machine_name))
 			end
 			update_forcefield(pos, meta:get_int("range"), true)
 		end

--
Gitblit v1.8.0