Rationalise machine terminology

All electrically-powered machines now consistently indicate their
tier (supply voltage) in their names.  As this implies that they are
electrically powered, the furnaces no longer have "Electric" in their
names.  The fuel-fired equivalents of electric machines, which exist
for alloy furnace and furnace, now say "Fuel-Fired" to distinguish them.
(The fuel-fired alloy furnace used to say "Coal", which was inaccurate
because it uses any fuel.  The fuel-fired furnace, from the default mod,
used to just be called "Furnace", which is ambiguous.)

Electric power generators now consistently indicate their tier and have
the word "Generator" in their names.  This makes their purpose much
clearer, and makes obvious craft guide searches produce useful results.
The fuel-fired generators, previously just (ambiguously) called
"Generator", are now explicitly "Fuel-Fired".
This commit is contained in:
Zefram
2014-06-20 16:58:52 +01:00
committed by RealBadAngel
parent f7d103cd96
commit 7c4b7046cc
24 changed files with 146 additions and 136 deletions

View File

@ -183,7 +183,7 @@ function technic.register_alloy_furnace(data)
})
minetest.register_node("technic:"..ltier.."_alloy_furnace_active",{
description = S(tier.." Alloy Furnace"),
description = S("%s Alloy Furnace"):format(tier),
tiles = {"technic_"..ltier.."_alloy_furnace_top.png",
"technic_"..ltier.."_alloy_furnace_bottom.png",
tube_side_texture,

View File

@ -36,7 +36,7 @@ function technic.register_electric_furnace(data)
"list[current_name;src;3,1;1,1;]"..
"list[current_name;dst;5,1;2,2;]"..
"list[current_player;main;0,6;8,4;]"..
"label[0,0;"..S("%s Electric Furnace"):format(tier).."]"
"label[0,0;"..S("%s Furnace"):format(tier).."]"
if data.upgrade then
formspec = formspec..
"list[current_name;upgrade1;1,4;1,1;]"..
@ -45,7 +45,7 @@ function technic.register_electric_furnace(data)
end
minetest.register_node("technic:"..ltier.."_electric_furnace", {
description = S("%s Electric Furnace"):format(tier),
description = S("%s Furnace"):format(tier),
tiles = {"technic_"..ltier.."_electric_furnace_top.png",
"technic_"..ltier.."_electric_furnace_bottom.png",
tube_side_texture,
@ -60,7 +60,7 @@ function technic.register_electric_furnace(data)
on_construct = function(pos)
local meta = minetest.get_meta(pos)
local name = minetest.get_node(pos).name
meta:set_string("infotext", S("%s Electric Furnace"):format(tier))
meta:set_string("infotext", S("%s Furnace"):format(tier))
meta:set_int("tube_time", 0)
meta:set_string("formspec", formspec)
local inv = meta:get_inventory()
@ -76,7 +76,7 @@ function technic.register_electric_furnace(data)
})
minetest.register_node("technic:"..ltier.."_electric_furnace_active", {
description = ("%s Electric Furnace"):format(tier),
description = ("%s Furnace"):format(tier),
tiles = {"technic_"..ltier.."_electric_furnace_top.png",
"technic_"..ltier.."_electric_furnace_bottom.png",
tube_side_texture,
@ -94,7 +94,7 @@ function technic.register_electric_furnace(data)
local meta = minetest.get_meta(pos)
local name = minetest.get_node(pos).name
local data = minetest.registered_nodes[name].technic
meta:set_string("infotext", S("%s Electric Furnace"):format(tier))
meta:set_string("infotext", S("%s Furnace"):format(tier))
meta:set_int("tube_time", 0)
meta:set_string("formspec", formspec)
local inv = meta:get_inventory()
@ -120,7 +120,7 @@ function technic.register_electric_furnace(data)
local eu_input = meta:get_int(tier.."_EU_input")
-- Machine information
local machine_name = S("%s Electric Furnace"):format(tier)
local machine_name = S("%s Furnace"):format(tier)
local machine_node = "technic:"..ltier.."_electric_furnace"
local machine_demand = data.demand

View File

@ -29,12 +29,12 @@ function technic.register_generator(data)
local generator_formspec =
"invsize[8,9;]"..
"label[0,0;"..S("%s Generator"):format(tier).."]"..
"label[0,0;"..S("Fuel-Fired %s Generator"):format(tier).."]"..
"list[current_name;src;3,1;1,1;]"..
"image[4,1;1,1;default_furnace_fire_bg.png]"..
"list[current_player;main;0,5;8,4;]"
local desc = S("%s Generator"):format(tier)
local desc = S("Fuel-Fired %s Generator"):format(tier)
minetest.register_node("technic:"..ltier.."_generator", {
description = desc,
tiles = {"technic_"..ltier.."_generator_top.png", "technic_machine_bottom.png",
@ -121,7 +121,7 @@ function technic.register_generator(data)
meta:set_string("infotext", desc.." ("..percent.."%)")
meta:set_string("formspec",
"size[8, 9]"..
"label[0, 0;Generator]"..
"label[0, 0;"..minetest.formspec_escape(desc).."]"..
"list[current_name;src;3, 1;1, 1;]"..
"image[4, 1;1, 1;default_furnace_fire_bg.png^[lowpart:"..
(percent)..":default_furnace_fire_fg.png]"..

View File

@ -11,7 +11,7 @@ function technic.register_solar_array(data)
"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 = S("%s Solar Array"):format(tier),
description = S("Arrayed Solar %s Generator"):format(tier),
active = false,
drawtype = "nodebox",
paramtype = "light",
@ -40,7 +40,7 @@ function technic.register_solar_array(data)
-- 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)
local machine_name = S("Arrayed Solar %s Generator"):format(tier)
pos1.y = pos.y + 1
pos1.x = pos.x
pos1.z = pos.z