From 1d0687556a52891aeadc0e8d9a58e44c53cb826b Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Fri, 15 Aug 2014 13:25:46 +0200
Subject: [PATCH] Fix music player's sound management

---
 technic/machines/register/solar_array.lua |   78 +++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/technic/machines/register/solar_array.lua b/technic/machines/register/solar_array.lua
index a46d033..615219b 100644
--- a/technic/machines/register/solar_array.lua
+++ b/technic/machines/register/solar_array.lua
@@ -5,13 +5,44 @@
 	local tier = data.tier
 	local ltier = string.lower(tier)
 
+	local run = function(pos, node)
+		-- The action here is to make the solar array produce power
+		-- Power is dependent on the light level and the height above ground
+		-- There are many ways to cheat by using other light sources like lamps.
+		-- As there is no way to determine if light is sunlight that is just a shame.
+		-- To take care of some of it solar panels do not work outside daylight hours or if
+		-- built below 0m
+		local pos1 = {}
+		local machine_name = S("Arrayed Solar %s Generator"):format(tier)
+		pos1.y = pos.y + 1
+		pos1.x = pos.x
+		pos1.z = pos.z
+		local light = minetest.get_node_light(pos1, nil)
+		local time_of_day = minetest.get_timeofday()
+		local meta = minetest.get_meta(pos)
+		light = light or 0
+
+		-- turn on array only during day time and if sufficient light
+		-- I know this is counter intuitive when cheating by using other light sources.
+		if light >= 12 and time_of_day >= 0.24 and time_of_day <= 0.76 and pos.y > 0 then
+			local charge_to_give = math.floor((light + pos.y) * data.power)
+			charge_to_give = math.max(charge_to_give, 0)
+			charge_to_give = math.min(charge_to_give, data.power * 50)
+			meta:set_string("infotext", S("%s Active"):format(machine_name).." ("..charge_to_give.."EU)")
+			meta:set_int(tier.."_EU_supply", charge_to_give)
+		else
+			meta:set_string("infotext", S("%s Idle"):format(machine_name))
+			meta:set_int(tier.."_EU_supply", 0)
+		end
+	end
+	
 	minetest.register_node("technic:solar_array_"..ltier, {
 		tiles = {"technic_"..ltier.."_solar_array_top.png",  "technic_"..ltier.."_solar_array_bottom.png",
 			 "technic_"..ltier.."_solar_array_side.png", "technic_"..ltier.."_solar_array_side.png",
 			 "technic_"..ltier.."_solar_array_side.png", "technic_"..ltier.."_solar_array_side.png"},
-		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
+		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1},
 		sounds = default.node_sound_wood_defaults(),
-		description = S("%s Solar Array"):format(tier),
+		description = S("Arrayed Solar %s Generator"):format(tier),
 		active = false,
 		drawtype = "nodebox",
 		paramtype = "light",
@@ -19,53 +50,12 @@
 			type = "fixed",
 			fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
 		},
-		technic = data,
 		on_construct = function(pos)
 			local meta = minetest.get_meta(pos)
 			local name = minetest.get_node(pos).name
-			local tier = minetest.registered_nodes[name].technic.tier
 			meta:set_int(tier.."_EU_supply", 0)
 		end,
-	})
-
-	minetest.register_abm({
-		nodenames = {"technic:solar_array_"..ltier},
-		interval = 1,
-		chance = 1,
-		action = function(pos, node, active_object_count, active_object_count_wider)
-			-- The action here is to make the solar array produce power
-			-- Power is dependent on the light level and the height above ground
-			-- 130m and above is optimal as it would be above cloud level.
-			-- Height gives 1/4 of the effect, light 3/4. Max. effect is 2880EU for the array.
-			-- There are many ways to cheat by using other light sources like lamps.
-			-- As there is no way to determine if light is sunlight that is just a shame.
-			-- To take care of some of it solar panels do not work outside daylight hours or if
-			-- built below -10m
-			local pos1 = {}
-			local data = minetest.registered_nodes[node.name].technic
-			local machine_name = S("%s Solar Array"):format(data.tier)
-			pos1.y = pos.y + 1
-			pos1.x = pos.x
-			pos1.z = pos.z
-			local light = minetest.get_node_light(pos1, nil)
-			local time_of_day = minetest.get_timeofday()
-			local meta = minetest.get_meta(pos)
-			light = light or 0
-
-
-			-- turn on array only during day time and if sufficient light
-			-- I know this is counter intuitive when cheating by using other light sources.
-			if light >= 12 and time_of_day >= 0.24 and time_of_day <= 0.76 and pos.y > 0 then
-				local charge_to_give = math.floor((light + pos.y) * data.power)
-				charge_to_give = math.max(charge_to_give, 0)
-				charge_to_give = math.min(charge_to_give, data.power * 50)
-				meta:set_string("infotext", S("%s Active"):format(machine_name).." ("..charge_to_give.."EU)")
-				meta:set_int(data.tier.."_EU_supply", charge_to_give)
-			else
-				meta:set_string("infotext", S("%s Idle"):format(machine_name))
-				meta:set_int(data.tier.."_EU_supply", 0)
-			end
-		end,
+		technic_run = run,
 	})
 
 	technic.register_machine(tier, "technic:solar_array_"..ltier, technic.producer)

--
Gitblit v1.8.0