From 623fcae4a4ad3ec12cc242b29b0d781357cff3f7 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sat, 24 May 2014 00:24:30 +0200
Subject: [PATCH] Fix supply converter
---
technic/machines/register/solar_array.lua | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/technic/machines/register/solar_array.lua b/technic/machines/register/solar_array.lua
index 1a3c85e..93deb86 100644
--- a/technic/machines/register/solar_array.lua
+++ b/technic/machines/register/solar_array.lua
@@ -1,14 +1,17 @@
+local S = technic.getter
+
function technic.register_solar_array(data)
local tier = data.tier
local ltier = string.lower(tier)
+
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},
sounds = default.node_sound_wood_defaults(),
- description = tier.." Solar Array",
+ description = S("%s Solar Array"):format(tier),
active = false,
drawtype = "nodebox",
paramtype = "light",
@@ -16,11 +19,9 @@
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,
})
@@ -39,6 +40,7 @@
-- To take care of some of it solar panels do not work outside daylight hours or if
-- built below -10m
local pos1 = {}
+ local machine_name = S("%s Solar Array"):format(tier)
pos1.y = pos.y + 1
pos1.x = pos.x
pos1.z = pos.z
@@ -46,7 +48,6 @@
local time_of_day = minetest.get_timeofday()
local meta = minetest.get_meta(pos)
light = light or 0
- local data = minetest.registered_nodes[node.name].technic
-- turn on array only during day time and if sufficient light
@@ -55,11 +56,11 @@
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", "Solar Array is active ("..charge_to_give.."EU)")
- meta:set_int(data.tier.."_EU_supply", charge_to_give)
+ 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", "Solar Array is inactive");
- meta:set_int(data.tier.."_EU_supply", 0)
+ meta:set_string("infotext", S("%s Idle"):format(machine_name))
+ meta:set_int(tier.."_EU_supply", 0)
end
end,
})
--
Gitblit v1.8.0