From c41f6509cf2758945fbc0810ff9d7ab0fc077228 Mon Sep 17 00:00:00 2001
From: _TarkFrench <39446667+Tarku@users.noreply.github.com>
Date: Sat, 26 Oct 2019 19:34:17 +0200
Subject: [PATCH] French translation: fix some errors and ortho (#513)
---
technic/machines/switching_station.lua | 207 +++++++++++++++++++++++++++++----------------------
1 files changed, 116 insertions(+), 91 deletions(-)
diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua
index dcf6849..7f3a0b9 100644
--- a/technic/machines/switching_station.lua
+++ b/technic/machines/switching_station.lua
@@ -1,43 +1,15 @@
--- SWITCHING STATION
--- The switching station is the center of all power distribution on an electric network.
---
--- The station collects power from sources (PR), distributes it to sinks (RE),
--- and uses the excess/shortfall to charge and discharge batteries (BA).
---
--- For now, all supply and demand values are expressed in kW.
---
--- It works like this:
--- All PR,BA,RE nodes are indexed and tagged with the switching station.
--- The tagging is to allow more stations to be built without allowing a cheat
--- with duplicating power.
--- All the RE nodes are queried for their current EU demand. Those which are off
--- would require no or a small standby EU demand, while those which are on would
--- require more.
--- If the total demand is less than the available power they are all updated with the
--- demand number.
--- If any surplus exists from the PR nodes the batteries will be charged evenly with this.
--- If the total demand requires draw on the batteries they will be discharged evenly.
---
--- If the total demand is more than the available power all RE nodes will be shut down.
--- We have a brown-out situation.
---
--- Hence all the power distribution logic resides in this single node.
---
--- Nodes connected to the network will have one or more of these parameters as meta data:
--- <LV|MV|HV>_EU_supply : Exists for PR and BA node types. This is the EU value supplied by the node. Output
--- <LV|MV|HV>_EU_demand : Exists for RE and BA node types. This is the EU value the node requires to run. Output
--- <LV|MV|HV>_EU_input : Exists for RE and BA node types. This is the actual EU value the network can give the node. Input
---
--- The reason the LV|MV|HV type is prepended toe meta data is because some machine could require several supplies to work.
--- This way the supplies are separated per network.
+-- See also technic/doc/api.md
technic.networks = {}
technic.cables = {}
+technic.redundant_warn = {}
local mesecons_path = minetest.get_modpath("mesecons")
local digilines_path = minetest.get_modpath("digilines")
local S = technic.getter
+
+local cable_entry = "^technic_cable_connection_overlay.png"
minetest.register_craft({
output = "technic:switching_station",
@@ -48,11 +20,22 @@
}
})
+local mesecon_def
+if mesecons_path then
+ mesecon_def = {effector = {
+ rules = mesecon.rules.default,
+ }}
+end
+
minetest.register_node("technic:switching_station",{
description = S("Switching Station"),
- tiles = {"technic_water_mill_top_active.png", "technic_water_mill_top_active.png",
- "technic_water_mill_top_active.png", "technic_water_mill_top_active.png",
- "technic_water_mill_top_active.png", "technic_water_mill_top_active.png"},
+ tiles = {
+ "technic_water_mill_top_active.png",
+ "technic_water_mill_top_active.png"..cable_entry,
+ "technic_water_mill_top_active.png",
+ "technic_water_mill_top_active.png",
+ "technic_water_mill_top_active.png",
+ "technic_water_mill_top_active.png"},
groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_all_tiers=1},
connect_sides = {"bottom"},
sounds = default.node_sound_wood_defaults(),
@@ -62,11 +45,15 @@
meta:set_string("active", 1)
meta:set_string("channel", "switching_station"..minetest.pos_to_string(pos))
meta:set_string("formspec", "field[channel;Channel;${channel}]")
+ local poshash = minetest.hash_node_position(pos)
+ technic.redundant_warn.poshash = nil
end,
after_dig_node = function(pos)
minetest.forceload_free_block(pos)
pos.y = pos.y - 1
minetest.forceload_free_block(pos)
+ local poshash = minetest.hash_node_position(pos)
+ technic.redundant_warn.poshash = nil
end,
on_receive_fields = function(pos, formname, fields, sender)
if not fields.channel then
@@ -80,9 +67,7 @@
local meta = minetest.get_meta(pos)
meta:set_string("channel", fields.channel)
end,
- mesecons = {effector = {
- rules = mesecon.rules.default,
- }},
+ mesecons = mesecon_def,
digiline = {
receptor = {action = function() end},
effector = {
@@ -106,48 +91,57 @@
--------------------------------------------------
-- Functions to traverse the electrical network
--------------------------------------------------
+local function flatten(map)
+ local list = {}
+ for key, value in pairs(map) do
+ list[#list + 1] = value
+ end
+ return list
+end
-- Add a wire node to the LV/MV/HV network
-local add_new_cable_node = function(nodes, pos, network_id)
- technic.cables[minetest.hash_node_position(pos)] = network_id
- -- Ignore if the node has already been added
- for i = 1, #nodes do
- if pos.x == nodes[i].x and
- pos.y == nodes[i].y and
- pos.z == nodes[i].z then
- return false
- end
+local function add_network_node(nodes, pos, network_id)
+ local node_id = minetest.hash_node_position(pos)
+ technic.cables[node_id] = network_id
+ if nodes[node_id] then
+ return false
end
- table.insert(nodes, {x=pos.x, y=pos.y, z=pos.z, visited=1})
+ nodes[node_id] = pos
return true
end
+local function add_cable_node(nodes, pos, network_id, queue)
+ if add_network_node(nodes, pos, network_id) then
+ queue[#queue + 1] = pos
+ end
+end
+
-- Generic function to add found connected nodes to the right classification array
-local check_node_subp = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, from_below, network_id)
+local check_node_subp = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, from_below, network_id, queue)
technic.get_or_load_node(pos)
- local meta = minetest.get_meta(pos)
local name = minetest.get_node(pos).name
if technic.is_tier_cable(name, tier) then
- add_new_cable_node(all_nodes, pos,network_id)
+ add_cable_node(all_nodes, pos,network_id, queue)
elseif machines[name] then
--dprint(name.." is a "..machines[name])
+ local meta = minetest.get_meta(pos)
meta:set_string(tier.."_network",minetest.pos_to_string(sw_pos))
if machines[name] == technic.producer then
- add_new_cable_node(PR_nodes, pos, network_id)
+ add_network_node(PR_nodes, pos, network_id)
elseif machines[name] == technic.receiver then
- add_new_cable_node(RE_nodes, pos, network_id)
+ add_network_node(RE_nodes, pos, network_id)
elseif machines[name] == technic.producer_receiver then
- add_new_cable_node(PR_nodes, pos, network_id)
- add_new_cable_node(RE_nodes, pos, network_id)
+ add_network_node(PR_nodes, pos, network_id)
+ add_network_node(RE_nodes, pos, network_id)
elseif machines[name] == "SPECIAL" and
(pos.x ~= sw_pos.x or pos.y ~= sw_pos.y or pos.z ~= sw_pos.z) and
from_below then
-- Another switching station -> disable it
- add_new_cable_node(SP_nodes, pos, network_id)
+ add_network_node(SP_nodes, pos, network_id)
meta:set_int("active", 0)
elseif machines[name] == technic.battery then
- add_new_cable_node(BA_nodes, pos, network_id)
+ add_network_node(BA_nodes, pos, network_id)
end
meta:set_int(tier.."_EU_timeout", 2) -- Touch node
@@ -155,8 +149,7 @@
end
-- Traverse a network given a list of machines and a cable type name
-local traverse_network = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, i, machines, tier, sw_pos, network_id)
- local pos = all_nodes[i]
+local traverse_network = function(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, pos, machines, tier, sw_pos, network_id, queue)
local positions = {
{x=pos.x+1, y=pos.y, z=pos.z},
{x=pos.x-1, y=pos.y, z=pos.z},
@@ -164,9 +157,8 @@
{x=pos.x, y=pos.y-1, z=pos.z},
{x=pos.x, y=pos.y, z=pos.z+1},
{x=pos.x, y=pos.y, z=pos.z-1}}
- --print("ON")
for i, cur_pos in pairs(positions) do
- check_node_subp(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, cur_pos, machines, tier, sw_pos, i == 3, network_id)
+ check_node_subp(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes, cur_pos, machines, tier, sw_pos, i == 3, network_id, queue)
end
end
@@ -178,7 +170,8 @@
end
local get_network = function(sw_pos, pos1, tier)
- local cached = technic.networks[minetest.hash_node_position(pos1)]
+ local network_id = minetest.hash_node_position(pos1)
+ local cached = technic.networks[network_id]
if cached and cached.tier == tier then
touch_nodes(cached.PR_nodes, tier)
touch_nodes(cached.BA_nodes, tier)
@@ -190,31 +183,71 @@
end
return cached.PR_nodes, cached.BA_nodes, cached.RE_nodes
end
- local i = 1
local PR_nodes = {}
local BA_nodes = {}
local RE_nodes = {}
local SP_nodes = {}
- local all_nodes = {pos1}
- repeat
- traverse_network(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes,
- i, technic.machines[tier], tier, sw_pos, minetest.hash_node_position(pos1))
- i = i + 1
- until all_nodes[i] == nil
- technic.networks[minetest.hash_node_position(pos1)] = {tier = tier, PR_nodes = PR_nodes,
- RE_nodes = RE_nodes, BA_nodes = BA_nodes, SP_nodes = SP_nodes, all_nodes = all_nodes}
+ local all_nodes = {}
+ local queue = {}
+ add_cable_node(all_nodes, pos1, network_id, queue)
+ while next(queue) do
+ local to_visit = {}
+ for _, pos in ipairs(queue) do
+ traverse_network(PR_nodes, RE_nodes, BA_nodes, SP_nodes, all_nodes,
+ pos, technic.machines[tier], tier, sw_pos, network_id, to_visit)
+ end
+ queue = to_visit
+ end
+ PR_nodes = flatten(PR_nodes)
+ BA_nodes = flatten(BA_nodes)
+ RE_nodes = flatten(RE_nodes)
+ SP_nodes = flatten(SP_nodes)
+ all_nodes = flatten(all_nodes)
+ technic.networks[network_id] = {tier = tier, all_nodes = all_nodes, SP_nodes = SP_nodes,
+ PR_nodes = PR_nodes, RE_nodes = RE_nodes, BA_nodes = BA_nodes}
return PR_nodes, BA_nodes, RE_nodes
end
-----------------------------------------------
-- The action code for the switching station --
-----------------------------------------------
+
+technic.powerctrl_state = true
+
+minetest.register_chatcommand("powerctrl", {
+ params = "state",
+ description = "Enables or disables technic's switching station ABM",
+ privs = { basic_privs = true },
+ func = function(name, state)
+ if state == "on" then
+ technic.powerctrl_state = true
+ else
+ technic.powerctrl_state = false
+ end
+ end
+})
+
+-- Run all the nodes
+local function run_nodes(list, run_stage)
+ for _, pos in ipairs(list) do
+ technic.get_or_load_node(pos)
+ local node = minetest.get_node_or_nil(pos)
+ if node and node.name then
+ local nodedef = minetest.registered_nodes[node.name]
+ if nodedef and nodedef.technic_run then
+ nodedef.technic_run(pos, node, run_stage)
+ end
+ end
+ end
+end
+
minetest.register_abm({
nodenames = {"technic:switching_station"},
label = "Switching Station", -- allows the mtt profiler to profile this abm individually
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
+ if not technic.powerctrl_state then return end
local meta = minetest.get_meta(pos)
local meta1 = nil
local pos1 = {}
@@ -237,6 +270,13 @@
minetest.forceload_free_block(pos)
minetest.forceload_free_block(pos1)
meta:set_string("infotext",S("%s Already Present"):format(machine_name))
+
+ local poshash = minetest.hash_node_position(pos)
+
+ if not technic.redundant_warn[poshash] then
+ technic.redundant_warn[poshash] = true
+ print("[TECHNIC] Warning: redundant switching station found near "..minetest.pos_to_string(pos))
+ end
return
end
@@ -253,21 +293,6 @@
minetest.forceload_free_block(pos)
minetest.forceload_free_block(pos1)
return
- end
-
- -- Run all the nodes
- local function run_nodes(list, run_stage)
- for _, pos2 in ipairs(list) do
- technic.get_or_load_node(pos2)
- local node2 = minetest.get_node(pos2)
- local nodedef
- if node2 and node2.name then
- nodedef = minetest.registered_nodes[node2.name]
- end
- if nodedef and nodedef.technic_run then
- nodedef.technic_run(pos2, node2, run_stage)
- end
- end
end
run_nodes(PR_nodes, technic.producer)
@@ -335,9 +360,9 @@
end
--dprint("Total BA demand:"..BA_eu_demand)
- meta:set_string("infotext",
- S("@1. Supply: @2 Demand: @3",
- machine_name, technic.pretty_num(PR_eu_supply), technic.pretty_num(RE_eu_demand)))
+ meta:set_string("infotext", S("@1. Supply: @2 Demand: @3",
+ machine_name, technic.EU_string(PR_eu_supply),
+ technic.EU_string(RE_eu_demand)))
-- If mesecon signal and power supply or demand changed then
-- send them via digilines.
@@ -436,11 +461,11 @@
end
end
minetest.register_abm({
+ label = "Machines: timeout check",
nodenames = {"group:technic_machine"},
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
- local meta = minetest.get_meta(pos)
for tier, machines in pairs(technic.machines) do
if machines[node.name] and switching_station_timeout_count(pos, tier) then
local nodedef = minetest.registered_nodes[node.name]
@@ -461,11 +486,11 @@
--Re-enable disabled switching station if necessary, similar to the timeout above
minetest.register_abm({
+ label = "Machines: re-enable check",
nodenames = {"technic:switching_station"},
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
- local meta = minetest.get_meta(pos)
local pos1 = {x=pos.x,y=pos.y-1,z=pos.z}
local tier = technic.get_cable_tier(minetest.get_node(pos1).name)
if not tier then return end
--
Gitblit v1.8.0