minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2025-07-04 17:20:37 +02:00
Code Issues Releases Wiki Activity

Rationalise machine terminology

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
technic/machines/LV/cnc.lua
View File

@ -127,7 +127,7 @@ end
-- The actual block inactive state
minetest.register_node("technic:cnc", {
description = S("CNC Machine"),
description = S("%s CNC Machine"):format("LV"),
tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
"technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"},
drawtype = "nodebox",
@ -143,7 +143,7 @@ minetest.register_node("technic:cnc", {
legacy_facedir_simple = true,
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("CNC Machine"))
meta:set_string("infotext", S("%s CNC Machine"):format("LV"))
meta:set_float("technic_power_machine", 1)
meta:set_string("formspec", cnc_formspec)
local inv = meta:get_inventory()
@ -159,7 +159,7 @@ minetest.register_node("technic:cnc", {
-- Active state block
minetest.register_node("technic:cnc_active", {
description = S("CNC Machine"),
description = S("%s CNC Machine"):format("LV"),
tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
"technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"},
paramtype2 = "facedir",
@ -182,7 +182,7 @@ minetest.register_abm({
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local eu_input = meta:get_int("LV_EU_input")
local machine_name = S("CNC Machine")
local machine_name = S("%s CNC Machine"):format("LV")
local machine_node = "technic:cnc"
local demand = 450

10
technic/machines/LV/coal_alloy_furnace.lua
View File

@ -1,5 +1,5 @@
-- Coal driven alloy furnace. This uses no EUs:
-- Fuel driven alloy furnace. This uses no EUs:
local S = technic.getter
@ -13,7 +13,7 @@ minetest.register_craft({
})
minetest.register_node("technic:coal_alloy_furnace", {
description = S("Coal Alloy Furnace"),
description = S("Fuel-Fired Alloy Furnace"),
tiles = {"technic_coal_alloy_furnace_top.png", "technic_coal_alloy_furnace_bottom.png",
"technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png",
"technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front.png"},
@ -24,7 +24,7 @@ minetest.register_node("technic:coal_alloy_furnace", {
on_construct = function(pos)
local meta = minetest.env:get_meta(pos)
meta:set_string("formspec", coal_alloy_furnace_formspec)
meta:set_string("infotext", S("Coal Alloy Furnace"))
meta:set_string("infotext", S("Fuel-Fired Alloy Furnace"))
local inv = meta:get_inventory()
inv:set_size("fuel", 1)
inv:set_size("src", 1)
@ -38,7 +38,7 @@ minetest.register_node("technic:coal_alloy_furnace", {
})
minetest.register_node("technic:coal_alloy_furnace_active", {
description = "Alloy Furnace",
description = S("Fuel-Fired Alloy Furnace"),
tiles = {"technic_coal_alloy_furnace_top.png", "technic_coal_alloy_furnace_bottom.png",
"technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png",
"technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front_active.png"},
@ -62,7 +62,7 @@ minetest.register_abm({
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local recipe = nil
local machine_name = S("Coal Alloy Furnace")
local machine_name = S("Fuel-Fired Alloy Furnace")
local formspec =
"size[8,9]"..
"label[0,0;"..machine_name.."]"..

5
technic/machines/LV/coal_furnace.lua Normal file
View File

@ -0,0 +1,5 @@
local S = technic.getter
if minetest.registered_nodes["default:furnace"].description == "Furnace" then
minetest.override_item("default:furnace", { description = S("Fuel-Fired Furnace") })
end

10
technic/machines/LV/compressor.lua
View File

@ -54,13 +54,13 @@ minetest.register_craft({
local compressor_formspec =
"invsize[8,9;]"..
"label[0,0;"..S("Compressor").."]"..
"label[0,0;"..S("%s Compressor"):format("LV").."]"..
"list[current_name;src;3,1;1,1;]"..
"list[current_name;dst;5,1;2,2;]"..
"list[current_player;main;0,5;8,4;]"
minetest.register_node("technic:compressor", {
description = S("Compressor"),
description = S("%s Compressor"):format("LV"),
tiles = {"technic_compressor_top.png", "technic_compressor_bottom.png",
"technic_compressor_side.png", "technic_compressor_side.png",
"technic_compressor_back.png", "technic_compressor_front.png"},
@ -70,7 +70,7 @@ minetest.register_node("technic:compressor", {
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("Compressor"))
meta:set_string("infotext", S("%s Compressor"):format("LV"))
meta:set_string("formspec", compressor_formspec)
local inv = meta:get_inventory()
inv:set_size("src", 1)
@ -83,7 +83,7 @@ minetest.register_node("technic:compressor", {
})
minetest.register_node("technic:compressor_active", {
description = S("Compressor"),
description = S("%s Compressor"):format("LV"),
tiles = {"technic_compressor_top.png", "technic_compressor_bottom.png",
"technic_compressor_side.png", "technic_compressor_side.png",
"technic_compressor_back.png", "technic_compressor_front_active.png"},
@ -105,7 +105,7 @@ minetest.register_abm({
action = function(pos, node, active_object_count, active_object_count_wider)
local meta = minetest.get_meta(pos)
local eu_input = meta:get_int("LV_EU_input")
local machine_name = S("Compressor")
local machine_name = S("%s Compressor"):format("LV")
local machine_node = "technic:compressor"
local demand = 300

10
technic/machines/LV/extractor.lua
View File

@ -61,13 +61,13 @@ minetest.register_craft({
local extractor_formspec =
"invsize[8,9;]"..
"label[0,0;"..S("Extractor").."]"..
"label[0,0;"..S("%s Extractor"):format("LV").."]"..
"list[current_name;src;3,1;1,1;]"..
"list[current_name;dst;5,1;2,2;]"..
"list[current_player;main;0,5;8,4;]"
minetest.register_node("technic:extractor", {
description = S("Extractor"),
description = S("%s Extractor"):format("LV"),
tiles = {"technic_lv_grinder_top.png", "technic_lv_grinder_bottom.png", "technic_lv_grinder_side.png",
"technic_lv_grinder_side.png", "technic_lv_grinder_side.png", "technic_lv_grinder_front.png"},
paramtype2 = "facedir",
@ -76,7 +76,7 @@ minetest.register_node("technic:extractor", {
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("Extractor"))
meta:set_string("infotext", S("%s Extractor"):format("LV"))
meta:set_string("formspec", extractor_formspec)
local inv = meta:get_inventory()
inv:set_size("src", 1)
@ -89,7 +89,7 @@ minetest.register_node("technic:extractor", {
})
minetest.register_node("technic:extractor_active", {
description = S("Extractor"),
description = S("%s Extractor"):format("LV"),
tiles = {"technic_lv_grinder_top.png", "technic_lv_grinder_bottom.png",
"technic_lv_grinder_side.png", "technic_lv_grinder_side.png",
"technic_lv_grinder_side.png", "technic_lv_grinder_front_active.png"},
@ -116,7 +116,7 @@ minetest.register_abm({
local eu_input = meta:get_int("LV_EU_input")
-- Machine information
local machine_name = S("Extractor")
local machine_name = S("%s Extractor"):format("LV")
local machine_node = "technic:extractor"
local demand = 300

10
technic/machines/LV/geothermal.lua
View File

@ -17,11 +17,11 @@ minetest.register_craft({
})
minetest.register_craftitem("technic:geothermal", {
description = S("Geothermal Generator"),
description = S("Geothermal %s Generator"):format("LV"),
})
minetest.register_node("technic:geothermal", {
description = S("Geothermal Generator"),
description = S("Geothermal %s Generator"):format("LV"),
tiles = {"technic_geothermal_top.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
"technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
paramtype2 = "facedir",
@ -30,13 +30,13 @@ minetest.register_node("technic:geothermal", {
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("Geothermal Generator"))
meta:set_string("infotext", S("Geothermal %s Generator"):format("LV"))
meta:set_int("LV_EU_supply", 0)
end,
})
minetest.register_node("technic:geothermal_active", {
description = S("Geothermal Generator"),
description = S("Geothermal %s Generator"):format("LV"),
tiles = {"technic_geothermal_top_active.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
"technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
paramtype2 = "facedir",
@ -96,7 +96,7 @@ minetest.register_abm({
end
meta:set_string("infotext",
S("Geothermal Generator").." ("..production_level.."%)")
S("Geothermal %s Generator"):format("LV").." ("..production_level.."%)")
if production_level > 0 and minetest.get_node(pos).name == "technic:geothermal" then
technic.swap_node (pos, "technic:geothermal_active")

1
technic/machines/LV/init.lua
View File

@ -7,6 +7,7 @@ dofile(path.."/cables.lua")
dofile(path.."/battery_box.lua")
dofile(path.."/alloy_furnace.lua")
dofile(path.."/coal_alloy_furnace.lua")
dofile(path.."/coal_furnace.lua")
dofile(path.."/solar_panel.lua")
dofile(path.."/solar_array.lua")
dofile(path.."/geothermal.lua")

10
technic/machines/LV/music_player.lua
View File

@ -17,7 +17,7 @@ local music_handles = {}
local music_player_formspec =
"invsize[8,9;]"..
"label[0,0;"..S("Music Player").."]"..
"label[0,0;"..S("%s Music Player"):format("LV").."]"..
"button[4,1;1,1;track1;1]"..
"button[5,1;1,1;track2;2]"..
"button[6,1;1,1;track3;3]"..
@ -37,14 +37,14 @@ local function play_track(pos, track)
end
minetest.register_node("technic:music_player", {
description = S("Music Player"),
description = S("%s Music Player"):format("LV"),
tiles = {"technic_music_player_top.png", "technic_machine_bottom.png", "technic_music_player_side.png",
"technic_music_player_side.png", "technic_music_player_side.png", "technic_music_player_side.png"},
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("Music Player"))
meta:set_string("infotext", S("%s Music Player"):format("LV"))
meta:set_int("active", 0)
meta:set_int("current_track", 1)
meta:set_string("formspec", music_player_formspec)
@ -66,7 +66,7 @@ minetest.register_node("technic:music_player", {
meta:set_int("current_track", current_track)
meta:set_string("formspec",
"invsize[8,9;]"..
"label[0,0;"..S("Music Player").."]"..
"label[0,0;"..S("%s Music Player"):format("LV").."]"..
"button[4,1;1,1;track1;1]"..
"button[5,1;1,1;track2;2]"..
"button[6,1;1,1;track3;3]"..
@ -104,7 +104,7 @@ minetest.register_abm({
action = function(pos, node, active_object_count, active_object_count_wider)
local meta = minetest.get_meta(pos)
local eu_input = meta:get_int("LV_EU_input")
local machine_name = S("Music Player")
local machine_name = S("%s Music Player"):format("LV")
local machine_node = "technic:music_player"
local demand = 150

6
technic/machines/LV/solar_panel.lua
View File

@ -9,7 +9,7 @@ minetest.register_node("technic:solar_panel", {
"technic_solar_panel_side.png", "technic_solar_panel_side.png", "technic_solar_panel_side.png"},
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
sounds = default.node_sound_wood_defaults(),
description = S("Solar Panel"),
description = S("Small Solar %s Generator"):format("LV"),
active = false,
drawtype = "nodebox",
paramtype = "light",
@ -21,7 +21,7 @@ minetest.register_node("technic:solar_panel", {
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_int("LV_EU_supply", 0)
meta:set_string("infotext", S("Solar Panel"))
meta:set_string("infotext", S("Small Solar %s Generator"):format("LV"))
end,
})
@ -48,7 +48,7 @@ minetest.register_abm({
-- To take care of some of it solar panels do not work outside daylight hours or if
-- built below -10m
local pos1 = {x=pos.x, y=pos.y+1, z=pos.z}
local machine_name = S("Solar Panel")
local machine_name = S("Small Solar %s Generator"):format("LV")
local light = minetest.get_node_light(pos1, nil)
local time_of_day = minetest.get_timeofday()

8
technic/machines/LV/water_mill.lua
View File

@ -16,7 +16,7 @@ minetest.register_craft({
})
minetest.register_node("technic:water_mill", {
description = S("Water Mill"),
description = S("Hydro %s Generator"):format("LV"),
tiles = {"technic_water_mill_top.png", "technic_machine_bottom.png",
"technic_water_mill_side.png", "technic_water_mill_side.png",
"technic_water_mill_side.png", "technic_water_mill_side.png"},
@ -26,13 +26,13 @@ minetest.register_node("technic:water_mill", {
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("infotext", S("Water Mill"))
meta:set_string("infotext", S("Hydro %s Generator"):format("LV"))
meta:set_int("LV_EU_supply", 0)
end,
})
minetest.register_node("technic:water_mill_active", {
description = S("Water Mill"),
description = S("Hydro %s Generator"):format("LV"),
tiles = {"technic_water_mill_top_active.png", "technic_machine_bottom.png",
"technic_water_mill_side.png", "technic_water_mill_side.png",
"technic_water_mill_side.png", "technic_water_mill_side.png"},
@ -85,7 +85,7 @@ minetest.register_abm({
end
meta:set_string("infotext",
S("Water Mill").." ("..production_level.."%)")
S("Hydro %s Generator"):format("LV").." ("..production_level.."%)")
if production_level > 0 and
minetest.get_node(pos).name == "technic:water_mill" then