diff options
Diffstat (limited to 'advtrains_interlocking')
35 files changed, 10981 insertions, 1410 deletions
diff --git a/advtrains_interlocking/README.md b/advtrains_interlocking/README.md new file mode 100644 index 0000000..d4a2699 --- /dev/null +++ b/advtrains_interlocking/README.md @@ -0,0 +1,85 @@ +# Interlocking for Advtrains + +The `advtrains_interlocking` mod provides various interlocking and signaling features for Advtrains. + +## Signal aspect tables + +Signal aspects are represented using tables with the following (optional) fields: + +* `main`: The main signal aspect. It provides information on the permitted speed after passing the signal. +* `dst`: The distant signal aspect. It provides information on the permitted speed after passing the next signal. +* `shunt`: Whether the train may proceed in shunt mode and, if the main aspect is danger, proceed in shunt mode. +* `proceed_as_main`: Whether the train should exit shunt mode when proceeding. +* `group`: The name of the signal group. +* `name`: The name of the signal aspect. + +The `main` and `dst` fields may be: + +* An positive number indicating the permitted speed, +* The number 0, indicating that the train should expect to stop at the current signal (or, for the `dst` field, the next signal), +* The number -1, indicating that the train can proceed (or, for the `dst` field, expect to proceed) at maximum speed, +* The constant `false`, indicating no change to the speed restriction, or +* The constant `nil`, indicating that the default value for the name aspect (if present) is used. If no valid signal aspect is named, or the signal aspect does not provide a default value, the value is assumed to be `false`. + +### Node definitions + +Signals should belong the following node groups: + +* `advtrains_signal`: `1` for static signals, `2` for signals with variable aspects. +* `save_in_at_nodedb`: This should be set to `1` to make sure that Advtrains always has access to the signal. +* `not_blocking_trains`: Setting this to `1` prevents trains from colliding with the signal. Setting this is not necessary, but recommended. + +The node definition should contain an `advtrains` field. + +The `advtrains` field of the node definition should contain a `supported_aspects` table for signals with variable aspects. + +The `supported_aspects` table should contain the following fields: + +* `main`: A list of values supported for the main aspect. +* `dst`: A list of values supported for the distant aspect. +* `shunt`: The value for the `shunt` field of the signal aspect or `nil` if the value is variable. +* `proceed_as_main`: The value for the `proceed_as_main` field of the signal aspect. +* `group`: The name of the signal group. +* `name`: A list of supported (named) aspects. +* `dst_shift`: The phase shift for distant/repeater signals. This field should not be set for main signals. + +The `advtrains` field of the node definition should contain a `get_aspect` function. This function is given the position of the signal and the node at the position. It should return the signal aspect table or, in the case of type 2 signals, the name of the signal aspect. + +For signals with variable aspects, a corresponding `set_aspect` function should also be defined. This function is given the position of the signal, the node at the position, and the new aspect. The new aspect is not guaranteed to be supported by the signal itself. + +Signals should also have the following callbacks set: + +* `on_rightclick` should be set to `advtrains.interlocking.signal_rc_handler` +* `can_dig` should be set to `advtrains.interlocking.signal_can_dig` +* `after_dig_node` should be set to `advtrains.interlocking.signal_after_dig` + +Alternatively, custom callbacks should call the respective functions. + +## Signal groups + +Signals may belong to signal groups are registered using `advtrains.interlocking.aspect.register_group`. + +Signal group definitions include the following fields: + +* `name`: The internal name of the signal group. It is recommended to use the mod name as a prefix to avoid name collisions. +* `label`: The description of the signal group. +* `aspects`: A table of signal aspects. Entries with string indices define the signal aspect with the name. Entries with numeric indices (starting from 1, counting upward) contain a list of corresponding aspect names (the first entry is preferred) and are mainly used for routing, where larger indices indicate that the signal with the aspect is closer to the signal with the "danger" (or similar) aspect. + +Each aspect in the signal group definition table should contain the following fields: + +* `label`: The description of the signal aspect. +* `main`, `shunt`, `proceed_as_main`: The default values for the aspect. Note that the `dst` field has no default value as it is automatically adjusted. + +## Notes + +It is allowed to provide other methods of setting the signal aspect. However: + +* These changes are ignored by the routesetting system. +* Please call `advtrains.interlocking.signal_readjust_aspect` after the signal aspect has changed. + +## Examples +An example of speed signals can be found in `advtrains_signals_ks`, which provides a subset of German signals. + +An example of route signals can be found in `advtrains_signals_japan`, which provides a subset of Japanese signals. + +The mods mentioned above are also used for demonstation purposes and can also be used for testing. diff --git a/advtrains_interlocking/approach.lua b/advtrains_interlocking/approach.lua index f60468a..eaf0248 100644 --- a/advtrains_interlocking/approach.lua +++ b/advtrains_interlocking/approach.lua @@ -14,19 +14,19 @@ local SHUNT_SPEED_MAX = advtrains.SHUNT_SPEED_MAX local il = advtrains.interlocking -local function get_over_function(speed, shunt) +local function get_over_function(speed, shunt, asptype) return function(pos, id, train, index, speed, lzbdata) if speed == 0 and minetest.settings:get_bool("at_il_force_lzb_halt") then atwarn(id,"overrun LZB 0 restriction (red signal) ",pos) -- Set train 1 index backward. Hope this does not lead to bugs... --train.index = index - 0.5 - train.speed_restriction = 0 + advtrains.speed.set_restriction(train, "main", 0) --TODO temporary --advtrains.drb_dump(id) --error("Debug: "..id.." triggered LZB-0") else - train.speed_restriction = speed + advtrains.speed.set_restriction(train, asptype, speed or -1) train.is_shunt = shunt end --atdebug("train drove over IP: speed=",speed,"shunt=",shunt) @@ -64,10 +64,7 @@ advtrains.tnc_register_on_approach(function(pos, id, train, index, has_entered, -- resetting the path does not matter to the set route and ARS doesn't need to be called again. if spos and ars_enabled then --atdebug(id,"IL Spos (ARS)",spos,asp) - local sigd = il.db.get_sigd_for_signal(spos) - if sigd then - il.ars_check(sigd, train) - end + il.ars_check(spos, train) end --atdebug("trav: ",pos, cn, asp, spos, "travsht=", lzb.travsht) local lspd @@ -94,6 +91,7 @@ advtrains.tnc_register_on_approach(function(pos, id, train, index, has_entered, end -- nspd can now be: 1. !=0: new speed restriction, 2. =0: stop here or 3. nil: keep travspd if nspd then + travspd = nspd if nspd == -1 then travspd = nil else @@ -106,7 +104,7 @@ advtrains.tnc_register_on_approach(function(pos, id, train, index, has_entered, lspd = travspd local udata = {signal_pos = spos} - local callback = get_over_function(lspd, travsht) + local callback = get_over_function(lspd, travsht, asp.type) lzbdata.il_shunt = travsht lzbdata.il_speed = travspd --atdebug("new lzbdata",lzbdata) diff --git a/advtrains_interlocking/ars.lua b/advtrains_interlocking/ars.lua index 434ae2c..393878a 100644 --- a/advtrains_interlocking/ars.lua +++ b/advtrains_interlocking/ars.lua @@ -3,26 +3,112 @@ --[[ The "ARS table" and its effects: - Every route has (or can have) an associated ARS table. This can either be - ars = { [n] = {ln="<line>"}/{rc="<routingcode>"}/{c="<a comment>"} } - a list of rules involving either line or routingcode matchers (or comments, those are ignored) - The first matching rule determines the route to set. - - or - - ars = {default = true} - this means that all trains that no other rule matches on should use this route + Every route has (or can have) an associated ARS table: + ars = { + [n] = { + ln = "<line>" -- either line + rc = "<routingcode>" -- or routingcode + tl = {min=1, max=2} -- or train length in meters + n = true/false -- true = logical not (matches everything that does not have this line/rc) + conj = { -- and conjunction, optional. This must be true in addition to the main rule + ln=... / rc=... / n=... -- like toplevel + conj=... -- can be nested + -- note that conj cannot have prio, in inherits the prio from main rule + } + prio = <num> -- optional, a priority number. If set, enables "multi-ARS" where train can wait for multiple routes at once + -- or + c="<a comment>" + } + default = true -- Route is the default route for trains + default_prio -- optional, priority for multi-ars with default route + default_conj = {...} -- optional, conditions (conjunction) that need to be fulfilled for this to be considered default route + } - Compound ("and") conjunctions are not supported (--TODO should they?) + In case a train matches the ARS rules of multiple routes, precedence is as follows: + 1. train matches rules without priority in one or more routes -> first matching route is unconditionally set + 2. train matches rules with priority in one or more routes -> all of the matching routes are set (multi-ars) + in the order given by priority, first available route is set + 3. route is default=true, default_prio=nil and train matches default_conj (if present) -> first default route is set + 4. one or more routes are default=true, with default_prio set,and train matches default_conj (if present) + -> all of the matching routes are set (multi-ars) in the order given by priority, first available route is set For editing, those tables are transformed into lines in a text area: {ln=...} -> LN ... {rc=...} -> RC ... {c=...} -> #... {default=true} -> * - See also route_ui.lua + n -> ! (e.g. ln=..., n=true -> !LN ...) + prio -> <num> (e.g. ln=..., prio=1 -> 1 LN ...) + + conj -> goes on the next line, with an & prepended, e.g.: + {ln="S1", conj={rc="Left"}} -> + LN S1 + & RC Left + + Example combining everything: + ars = { + [1] = { + ln = "S1" + n = true + prio = 4 + conj = { + rc = "R4" + } + } + default = true + default_prio = 2 + default_conj = { + rc = "R5" + n = true + } + } -> + 4 !LN S1 + & RC R4 + 2 * + & !RC R5 + ]] local il = advtrains.interlocking +local function parse_trainlen(tlstr) + mins, maxs = string.match(tlstr, "^(%d*)%-(%d+)$") + if mins and maxs then + return {min=tonumber(mins), max=tonumber(maxs)} + end + return {min=tonumber(tlstr)} + -- if it's not parseable at all it will return an empty table which means invalid +end +local function trainlen_to_str(tl) + if tl.min and tl.max then + return tl.min.."-"..tl.max + elseif tl.min then + return tl.min + elseif tl.max then + return "0-"..tl.max + else + return "?" + end +end + + +local function conj_to_text(conj, txt) + while conj do + n = "" + if conj.n then + n = "!" + end + if conj.ln then + txt[#txt+1] = "& "..n.."LN "..conj.ln + elseif conj.rc then + txt[#txt+1] = "& "..n.."RC "..conj.rc + elseif conj.tl then + txt[#txt+1] = "& "..n.."TL "..trainlen_to_str(conj.tl) + end + conj = conj.conj + end +end + -- The ARS data are saved in a table format, but are entered in text format. Utility functions to transform between both. function il.ars_to_text(arstab) if not arstab then @@ -32,124 +118,274 @@ function il.ars_to_text(arstab) local txt = {} for i, arsent in ipairs(arstab) do + local prio = "" + if arsent.prio then + prio = arsent.prio.." " + end local n = "" if arsent.n then n = "!" end if arsent.ln then - txt[#txt+1] = n.."LN "..arsent.ln + txt[#txt+1] = prio..n.."LN "..arsent.ln elseif arsent.rc then - txt[#txt+1] = n.."RC "..arsent.rc + txt[#txt+1] = prio..n.."RC "..arsent.rc + elseif arsent.tl then + txt[#txt+1] = prio..n.."TL "..trainlen_to_str(arsent.tl) elseif arsent.c then txt[#txt+1] = "#"..arsent.c end + conj_to_text(arsent.conj, txt) end if arstab.default then - return "*\n" .. table.concat(txt, "\n") + local prio = "" + if arstab.default_prio then + prio = arstab.default_prio.." " + end + txt[#txt+1] = prio.."*" + conj_to_text(arstab.default_conj, txt) end return table.concat(txt, "\n") end +local function parse_ruleexp(line) + local excl, key, val = string.match(line, "^%s*(!?)%s*([RLT][CNL])%s+(.+)%s*$") + if key == "RC" then + return {rc=val, n=(excl=="!")} + elseif key == "LN" then + return {ln=val, n=(excl=="!")} + elseif key == "TL" then + return {tl=parse_trainlen(val), n=(excl=="!")} + end +end + function il.text_to_ars(t) - if t=="" then + if not string.match(t, "%S+") then return nil - elseif t=="*" then - return {default=true} end local arstab = {} + local previtem for line in string.gmatch(t, "[^\r\n]+") do - if line=="*" then - arstab.default = true + -- a) comment + local ct = string.match(line, "^#(.*)$") + if ct then + arstab[#arstab+1] = {c = ct} + previtem = nil else - local c, v = string.match(line, "^(...?)%s(.*)$") - if c and v then - local n = nil - if string.sub(c,1,1) == "!" then - n = true - c = string.sub(c,2) - end - local tt=string.upper(c) - if tt=="LN" then - arstab[#arstab+1] = {ln=v, n=n} - elseif tt=="RC" then - arstab[#arstab+1] = {rc=v, n=n} + -- b) Conjunction to the previous item + local conline = string.match(line, "^%s*&(.+)$") + if conline then + local conj = parse_ruleexp(conline) + if conj and previtem==true then + -- previtem was default + arstab.default_conj = conj + previtem = conj + elseif conj and previtem then + previtem.conj = conj + previtem = conj + else + -- dont know what to do with line, put as comment + arstab[#arstab+1] = {c = "? "..line} + previtem = nil end else - local ct = string.match(line, "^#(.*)$") - if ct then arstab[#arstab+1] = {c = ct} end + -- c) Normal rule spec + local prio, ruleline = string.match(line, "^%s*([0-9]*)%s*(.+)%s*$") + if ruleline == "*" then + -- ruleline is the asterisk, this is default + arstab.default = true + arstab.default_prio = tonumber(prio) -- evals to nil if not given + previtem = true -- marks that previtem was asterisk + elseif ruleline then + -- ruleline is present, parse it + local rule = parse_ruleexp(ruleline) + if not rule then + -- dont know what to do with line, put as comment + arstab[#arstab+1] = {c = "? "..line} + previtem = nil + else + rule.prio = tonumber(prio) -- evals to nil if not given + arstab[#arstab+1] = rule + previtem = rule + end + else + -- d) nothing else works, save line as comment + arstab[#arstab+1] = {c = "? "..line} + previtem = nil + end end end end return arstab end -local function find_rtematch(routes, train) - local default - for rteid, route in ipairs(routes) do - if route.ars then - if route.ars.default then - default = rteid - else - if il.ars_check_rule_match(route.ars, train) then - return rteid - end - end + +local function match_arsent(arsent, train) + local rule_matches = false + if arsent.ln then + local line = train.line + rule_matches = line and arsent.ln == line + if arsent.n then rule_matches = not rule_matches end + elseif arsent.rc then + local routingcode = train.routingcode + rule_matches = routingcode and string.find(" "..routingcode.." ", " "..arsent.rc.." ", nil, true) + if arsent.n then rule_matches = not rule_matches end + elseif arsent.tl then + local trainlen = train.trainlen + local lmin, lmax = arsent.tl.min, arsent.tl.max + if lmin and lmax then + rule_matches = (trainlen >= lmin) and (trainlen < lmax) + elseif lmin then + rule_matches = (trainlen >= lmin) + elseif lmax then + rule_matches = (trainlen < lmax) + else + -- errorneous entry never matches end + if arsent.n then rule_matches = not rule_matches end + end + if rule_matches then + -- if the entry has a conjunction, go on checking + if arsent.conj then + return match_arsent(arsent.conj, train) + else + return true + end + else + return false end - return default end --- Checks whether ARS rule explicitly matches. This does not take into account the "default" field, since a wider context is required for this. --- Returns the rule number that matched, or nil if nothing matched +-- Given an ARS rule table, check whether any of the clauses in it match the train. +-- Returns: match_specific, match_default +-- match_specific: One of the clauses explicitly matched (if this is non-false, match_default is not checked and always given false) +-- match_default: The default clause (*) matched (as well as any conjunctions attached to the default clause) +-- both of these can be either true (unconditional match), a number (priority for multi-ars) or false function il.ars_check_rule_match(ars, train) if not ars then - return nil + return nil, nil end - local line = train.line - local routingcode = train.routingcode for arskey, arsent in ipairs(ars) do - --atdebug(arsent, line, routingcode) - if arsent.n then - -- rule is inverse... - if arsent.ln and (not line or arsent.ln ~= line) then - return arskey - elseif arsent.rc and (not routingcode or not string.find(" "..routingcode.." ", " "..arsent.rc.." ", nil, true)) then - return arskey - end - return nil + local rule_matches = match_arsent(arsent, train) + if rule_matches then + return (arsent.prio or true), nil end - - if arsent.ln and line and arsent.ln == line then - return arskey - elseif arsent.rc and routingcode and string.find(" "..routingcode.." ", " "..arsent.rc.." ", nil, true) then - return arskey + end + if ars.default then + local def_matches = true + if ars.default_conj then + def_matches = match_arsent(ars.default_conj, train) + end + if def_matches then + return false, (ars.default_prio or true) end end - return nil + return false,false end -function advtrains.interlocking.ars_check(sigd, train) - local tcbs = il.db.get_tcbs(sigd) - if not tcbs or not tcbs.routes then return end - - if tcbs.ars_disabled then - -- No-ARS mode of signal. - -- ignore... - return +local function sort_priority(sprio) + -- insertion sort + local order = {} + local oprio = {} + for rteid, prio in pairs(sprio) do + local inspos = 1 + while order[inspos] do + if oprio[inspos] > prio then + -- next item has higher priority number (= less urgent), insert before it + break + elseif oprio[inspos] == prio and order[inspos] > rteid then + -- next item has same priority as current and a higher routeid, insert before it + break + end + inspos = inspos + 1 + end + table.insert(order, inspos, rteid) + table.insert(oprio, inspos, prio) end - - if tcbs.routeset then - -- ARS is not in effect when a route is already set - -- just "punch" routesetting, just in case callback got lost. - minetest.after(0, il.route.update_route, sigd, tcbs, nil, nil) - return + --atdebug("sort_priority",sprio,"result",order,oprio) + if #order == 1 then + return order[1] -- only one route, table doesnt make sense end - - local rteid = find_rtematch(tcbs.routes, train) - if rteid then - --delay routesetting, it should not occur inside train step - -- using after here is OK because that gets called on every path recalculation - minetest.after(0, il.route.update_route, sigd, tcbs, rteid, nil) + return order +end + +local function find_rtematch(routes, train) + local sprio = {} + local default = nil + local dprio = {} + for rteid, route in ipairs(routes) do + if route.ars then + local mspec, mdefault = il.ars_check_rule_match(route.ars, train) + --atdebug("route",rteid,"ars",route.ars,"gives", mspec, mdefault) + if mspec == true then + return rteid + elseif mspec then + sprio[rteid] = mspec + end + if mdefault == true then + if not default then default = rteid end + elseif mdefault then + dprio[rteid] = mdefault + end + end + end + if next(sprio) then + return sort_priority(sprio) + elseif default then + return default + elseif next(dprio) then + return sort_priority(dprio) + else + return nil + end +end + + +function advtrains.interlocking.ars_check(signalpos, train, trig_from_dst) + -- check for distant signal + -- this whole check must be delayed until after the route setting has taken place, + -- because before that the distant signal is yet unknown + if not trig_from_dst then + minetest.after(0.5, function() + -- does signal have dst? + local _, remote = il.signal.get_aspect(signalpos) + if remote then + advtrains.interlocking.ars_check(remote, train, true) + end + end) + end + + local sigd = il.db.get_sigd_for_signal(signalpos) + local tcbs = sigd and il.db.get_tcbs(sigd) + -- trigger ARS on this signal + if tcbs and tcbs.routes then + + if tcbs.ars_disabled or tcbs.ars_ignore_next then + -- No-ARS mode of signal. + -- ignore... + -- Note: ars_ignore_next is set by signalling formspec when route is cancelled + tcbs.ars_ignore_next = nil + return + end + if trig_from_dst and tcbs.no_dst_ars_trig then + -- signal not to be triggered from distant + return + end + + if tcbs.routeset then + -- ARS is not in effect when a route is already set + -- just "punch" routesetting, just in case callback got lost. + minetest.after(0, il.route.update_route, sigd, tcbs, nil, nil) + return + end + + local rteid = find_rtematch(tcbs.routes, train) + if rteid then + --atdebug("Ars setting ",rteid) + --delay routesetting, it should not occur inside train step + -- using after here is OK because that gets called on every path recalculation + minetest.after(0, il.route.update_route, sigd, tcbs, rteid, nil) + end end end diff --git a/advtrains_interlocking/autonaming.lua b/advtrains_interlocking/autonaming.lua new file mode 100644 index 0000000..78886c0 --- /dev/null +++ b/advtrains_interlocking/autonaming.lua @@ -0,0 +1,71 @@ +-- autonaming.lua +-- Automatically set names of signals (and maybe track sections) based on numbering + +-- Get current translator +local S = advtrains.interlocking.translate + +local function find_highest_count(prefix) + local cnt = 0 + local pattern = "^"..prefix.."(%d+)$" + local alltcb = advtrains.interlocking.db.get_all_tcb() + for _,tcb in pairs(alltcb) do + for _,tcbs in pairs(tcb) do + if tcbs.signal_name then + local mnum = string.match(tcbs.signal_name, pattern) + if mnum then + local n = tonumber(mnum) + if n and n > cnt then + cnt = n + end + end + end + end + end + return cnt +end + +-- { pname = { prefix = "FOO", count = 7 } } +local player_prefix_info = {} + +function advtrains.interlocking.set_autoname_prefix(pname, prefix) + if prefix and #prefix>0 then + -- check that it is valid + if not string.match(prefix,"[A-Za-z_]+") then + return false, "Illegal prefix, only letters and _ allowed" + end + -- scan database for this prefix to find out the highest count + local count = find_highest_count(prefix) + player_prefix_info[pname] = { prefix = prefix, count = count} + return true, S("Prefix set, next signal name will be: @1", advtrains.interlocking.get_next_autoname(pname, true)) + else + player_prefix_info[pname] = nil + return true, S("Prefix unset, signals are not auto-named for you!") + end +end + +function advtrains.interlocking.get_next_autoname(pname, no_increment) + local pi = player_prefix_info[pname] + if pi then + local name = pi.prefix..(pi.count+1) + if not no_increment then pi.count = pi.count+1 end + return name + else + return nil + end +end + +function advtrains.interlocking.add_autoname_to_tcbs(tcbs, pname) + if not tcbs or not pname then return end + if tcbs.signal_name then return end -- name already set + + tcbs.signal_name = advtrains.interlocking.get_next_autoname(pname) +end + +minetest.register_chatcommand("at_nameprefix", + { + params = "<prefix>", + description = S("Sets the current prefix for automatically naming interlocking components. Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on"), + privs = {interlocking = true}, + func = advtrains.interlocking.set_autoname_prefix, +}) + diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua index a35d446..bd90e36 100644 --- a/advtrains_interlocking/database.lua +++ b/advtrains_interlocking/database.lua @@ -2,71 +2,19 @@ -- saving the location of TCB's, their neighbors and their state --[[ -== THIS COMMENT IS PARTIALLY INCORRECT AND OUTDATED! == - -The interlocking system is based on track circuits. -Track circuit breaks must be manually set by the user. Signals must be assigned to track circuit breaks and to a direction(connid). -To simplify the whole system, there is no overlap. -== Trains == -Trains always occupy certain track circuits. These are shown red in the signalbox view (TRAIN occupation entry). -== Database storage == -The things that are actually saved are the Track Circuit Breaks. Each TCB holds a list of the TCBs that are adjacent in each direction. -TC occupation/state is then saved inside each (TCB,Direction) and held in sync across all TCBs adjacent to this one. If something should not be in sync, -all entries are merged to perform the most restrictive setup. -== Traverser function == -To determine and update the list of neighboring TCBs, we need a traverser function. -It will start at one TCB in a specified direction (connid) and use get_adjacent_rail to crawl along the track. When encountering a turnout or a crossing, -it needs to branch(call itself recursively) to find all required TCBs. Those found TCBs are then saved in a list as tuples (TCB,Dir) -In the last step, they exchange their neighbors. -== TC states == -A track circuit does not have a state as such, but has more or less a list of "reservations" -type can be one of these: -TRAIN See Trains obove -ROUTE Route set from a signal, but no train has yet passed that signal. -Not implemented (see note by reversible): OWNED - former ROUTE segments that a train has begun passing (train_id assigned) - - Space behind a train up to the next signal, when a TC is set as REVERSIBLE -Certain TCs can be marked as "allow call-on". -== Route setting: == -Routes are set from a signal (the entry signal) to another signal facing the same direction (the exit signal) -Remember that signals are assigned to a TCB and a connid. -Whenever this is done, the following track circuits are set "reserved" by the train by saving the entry signal's ID: -- all TCs on the direct way of the route - set as ROUTE -Route setting fails whenever any TC that we want to set ROUTE to is already set ROUTE or TRAIN from another signal (except call-on, see below) -Apart from this, we need to set turnouts -- Turnouts on the track are set held as ROUTE -- Turnouts that purpose as flank protection are set held as FLANK (NOTE: left as an idea for later, because it's not clear how to do this properly without an engineer) -Note: In SimSig, it is possible to set a route into an still occupied section on the victoria line sim. (at the depot exit at seven sisters), although - there are still segments set ahead of the first train passing, remaining from another route. - Because our system will be able to remember "requested routes" and set them automatically once ready, this is not necessary here. -== Call-On/Multiple Trains == -It will be necessary to join and split trains using call-on routes. A call-on route may be set when: -- there are no ROUTE reservations -- there are TRAIN reservations only inside TCs that have "allow call-on" set -== TC Properties == -Note: Reversible property will not be implemented, assuming everything as non-rev. -This is sufficient to cover all use cases, and is done this way in reality. - REVERSIBLE - Whether trains are allowed to reverse while on track circuit - This property is supposed to be set for station tracks, where there is a signal at each end, and for sidings. - It should in no case be set for TCs covering turnouts, or for main running lines. - When a TC is not set as reversible, the OWNED status is cleared from the TC right after the train left it, - to allow other trains to pass it. - If it is set reversible, interlocking will keep the OWNED state behind the train up to the next signal, clearing it - as soon as the train passes another signal or enters a non-reversible section. -CALL_ON_ALLOWED - Whether this TC being blocked (TRAIN or ROUTE) does not prevent shunt routes being set through this TC -== More notes == -- It may not be possible to switch turnouts when their TC has any state entry - == Route releasing (TORR) == A train passing through a route happens as follows: Route set from entry to exit signal -Train passes entry signal and enters first TC past the signal --> Route from signal cleared (TCs remain locked) --> ROUTE status of first TC past signal cleared +Train passes entry signal and enters first TS past the signal +-> Route from signal cleared (TSs remain locked) +-> 'route' status of first TS past signal cleared +-> 'route_post' (holding the turnout locks) remains set Train continues along the route. -Whenever train leaves a TC +Whenever train leaves a TS -> Clearing any routes set from this TC outward recursively - see "Reversing problem" -Whenever train enters a TC --> Clear route status from the just entered TC +-> Free turnout locks and clear 'route_post' +Whenever train enters a TS +-> Clear route status from the just entered TC (but not route_post) Note that this prohibits by design that the train clears the route ahead of it. == Reversing Problem == Encountered at the Royston simulation in SimSig. It is solved there by imposing a time limit on the set route. Call-on routes can somehow be set anyway. @@ -89,8 +37,27 @@ Another case of this: The / here is a non-interlocked turnout (to a non-frequently used siding). For some reason, there is no exit node there, so the route is set to the signal at the right end. The train is taking the exit to the siding and frees the TC, without ever having touched the right TC. + + +== Terminology / Variable Names == + +"tcb" : A TCB table (as in track_circuit_breaks) +"tcbs" : One side of a tcb (that is tcb == {[1] = tcbs, [2] = tcbs}) +"sigd" : A table of format {p=<position>, s=<side aka connid>} by which a "tcbs" is uniqely identified. + +== Section Autorepair & Turnout Cache == + +As fundamental part of reworked route programming mechanism, Track Section objects become weak now. They are created and destroyed on demand. +ildb.repair_tcb automatically checks all nearby sections for issues and repairs them automatically. + +Also the database now holds a cache of the turnouts in the section and their position for all possible driving paths. +Every time a repair operation takes place, and on every track edit operation, the affected sections need to have their cache updated. + ]]-- +-- Get current translator +local S = advtrains.interlocking.translate + local TRAVERSER_LIMIT = 1000 @@ -111,7 +78,45 @@ advtrains.interlocking.npr_rails = {} function ildb.load(data) if not data then return end if data.tcbs then - track_circuit_breaks = data.tcbs + if data.tcbpts_conversion_applied then + track_circuit_breaks = data.tcbs + else + -- Convert legacy pos_to_string tcbs to new advtrains.encode_pos position strings + for pts, tcb in pairs(data.tcbs) do + local pos = minetest.string_to_pos(pts) + if pos then + -- that was a pos_to_string + local epos = advtrains.encode_pos(pos) + atdebug("ILDB converting TCB position format",pts,"->",epos) + track_circuit_breaks[epos] = tcb + else + -- keep entry, it is already new + track_circuit_breaks[pts] = tcb + end + -- convert the routes.[].locks table keys + for t_side,tcbs in pairs(tcb) do + if tcbs.routes then + for t_rnum,route in pairs(tcbs.routes) do + for t_rsnm,rseg in ipairs(route) do + local locks_n = {} + for lpts,state in pairs(rseg.locks) do + local lpos = minetest.string_to_pos(lpts) + if lpos then + local epos = advtrains.encode_pos(lpos) + atdebug("ILDB converting tcb",pts,"side",t_side,"route",t_rnum,"lock position format",lpts,"->",epos) + locks_n[epos] = state + else + -- already correct format + locks_n[lpts] = state + end + end + rseg.locks = locks_n + end + end + end + end + end + end end if data.ts then track_sections = data.ts @@ -120,7 +125,23 @@ function ildb.load(data) signal_assignments = data.signalass end if data.rs_locks then - advtrains.interlocking.route.rte_locks = data.rs_locks + if data.tcbpts_conversion_applied then + advtrains.interlocking.route.rte_locks = data.rs_locks + else + advtrains.interlocking.route.rte_locks = {} + for pts, lta in pairs(data.rs_locks) do + local pos = minetest.string_to_pos(pts) + if pos then + -- that was a pos_to_string + local epos = advtrains.encode_pos(pos) + atdebug("ILDB converting Route Lock position format",pts,"->",epos) + advtrains.interlocking.route.rte_locks[epos] = lta + else + -- keep entry, it is already new + advtrains.interlocking.route.rte_locks[pts] = lta + end + end + end end if data.rs_callbacks then advtrains.interlocking.route.rte_callbacks = data.rs_callbacks @@ -132,6 +153,9 @@ function ildb.load(data) advtrains.interlocking.npr_rails = data.npr_rails end + -- let signal_api load data + advtrains.interlocking.signal.load(data) + --COMPATIBILITY to Signal aspect format -- TODO remove in time... for pts,tcb in pairs(track_circuit_breaks) do @@ -165,7 +189,7 @@ function ildb.load(data) end function ildb.save() - return { + local data = { tcbs = track_circuit_breaks, ts=track_sections, signalass = signal_assignments, @@ -173,7 +197,10 @@ function ildb.save() rs_callbacks = advtrains.interlocking.route.rte_callbacks, influence_points = influence_points, npr_rails = advtrains.interlocking.npr_rails, + tcbpts_conversion_applied = true, -- remark that legacy pos conversion has taken place } + advtrains.interlocking.signal.save(data) + return data end -- @@ -183,32 +210,79 @@ TCB data structure -- This is the "A" side of the TCB [1] = { -- Variant: with adjacent TCs. ts_id = <id> -- ID of the assigned track section + xlink = <other sigd> -- If two sections of track are not physically joined but must function as one TS (e.g. knights move crossing), a bidirectional link can be added with exactly one other TCB. + -- TS search will behave as if these two TCBs were physically connected. + signal = <pos> -- optional: when set, routes can be set from this tcb/direction and signal -- aspect will be set accordingly. routeset = <index in routes> -- Route set from this signal. This is the entry that is cleared once -- train has passed the signal. (which will set the aspect to "danger" again) - route_committed = <boolean> -- When setting/requesting a route, routetar will be set accordingly, + -- routeset may be a table (e.g. {1,2}) while the route is not committed yet, indicating a wait for multiple routes at once (Multi-ARS) + route_committed = <boolean> -- When setting/requesting a route, routeset will be set accordingly, -- while the signal still displays danger and nothing is written to the TCs -- As soon as the route can actually be set, all relevant TCs and turnouts are set and this field - -- is set true, clearing the signal + -- is set true, clearing the signal (when this is true, routeset is never a table) aspect = <asp> -- The aspect the signal should show. If this is nil, should show the most restrictive aspect (red) signal_name = <string> -- The human-readable name of the signal, only for documenting purposes routes = { <route definition> } -- a collection of routes from this signal route_auto = <boolean> -- When set, we will automatically re-set the route (designated by routeset) + + auto_block_signal_mode = <boolean> -- Simplified mode for simple block signals: + -- Signal has only one route which is constantly re-set (route_auto is implied) + -- Supposed to be used when only a single track section is ahead and it directly ends at the next signal + -- UI only offers to enable or disable the signal + -- ARS is implicitly disabled on the signal }, -- This is the "B" side of the TCB [2] = { -- Variant: end of track-circuited area (initial state of TC) ts_id = nil, -- this is the indication for end_of_interlocking - section_free = <boolean>, --this can be set by an exit node via mesecons or atlatc, - -- or from the tc formspec. } } +Route definition +routes = { + [i] = { + -- one table for each track section on the route + -- Note that the section ID is implicitly inferred from the TCB + 1 = { + locks = { -- component locks for this section of the route. + 800080008000 = st + } + next = S[(-23,9,0)/2] -- the start TCB of the next route segment (pointing forward) + -- Signal info: relates to the signal at the start of this section: + main_aspect = "_free" -- The main aspect that the route start signal is to show + assign_dst = false -- Whether to assign distant signal (affects only the signal at the start of the route) + -- false: start signal does not set distant signal (the default), for long blocks + -- it is assumed that the next main signal will have its own distant sig + -- true: start signal sets distant signal to the next signal on the route with route_role "main" (typically the end signal) + -- for short blocks where end signal doesn't have its own distant sig + call_on = false -- if true, when this route is set, section is allowed to be occupied by a train (but it must not have a route set in) + } + 2 = { + locks = {} + -- if next is omitted, then there is no final TCB (e.g. a buffer) + } + name = "<the route name>" + ars = { <ARS rule definition table> } + use_rscache = false -- if true, the track section's rs_cache will be used to set locks in addition to the locks table + -- this is disabled for legacy routes, but enabled for all new routes by default + default_autoworking = false -- if true, when route is set autoworking will be by default on. Used for Blocksignal mode + } +} + Track section [id] = { name = "Some human-readable name" tc_breaks = { <signal specifier>,... } -- Bounding TC's (signal specifiers) - -- Can be direct ends (auto-detected), conflicting routes or TCBs that are too far away from each other + rs_cache = { [startTcbPosEnc] = { [endTcbPosEnc] = { [componentPosEnc] = "state" } } } + -- Saves the turnout states that need to be locked when a route is set from tcb#x to tcb#y + -- e.g. "800080008005" = { "800080007EEA" = { "800080008000" = "st" } } + -- start TCB end TCB switch pos + -- Recalculated on every change via update_rs_cache + -- Note that the tcb side number is not saved because it is unnecessary + fixed_locks = { "800080008000" = "st" } + -- table of fixed locks to be set for all routes thru this section (e.g. level crossings + route = { origin = <signal>, -- route origin entry = <sigd>, -- supposed train entry point @@ -224,7 +298,9 @@ Track section -- first says whether to clear the routesetting status from the origin signal. -- locks contains the positions where locks are held by this ts. -- 'route' is cleared when train enters the section, while 'route_post' cleared when train leaves section. + trains = {<id>, ...} -- Set whenever a train (or more) reside in this TC + -- Note: The same train ID may be contained in this mapping multiple times, when it has entered the section in two different places. } @@ -237,24 +313,13 @@ signal_assignments = { } ]] +-- Maximum scan length for track iterator +local TS_MAX_SCAN = 1000 --- -function ildb.create_tcb(pos) - local new_tcb = { - [1] = {}, - [2] = {}, - } - local pts = advtrains.roundfloorpts(pos) - if not track_circuit_breaks[pts] then - track_circuit_breaks[pts] = new_tcb - return true - else - return false - end -end +-- basic functions function ildb.get_tcb(pos) - local pts = advtrains.roundfloorpts(pos) + local pts = advtrains.encode_pos(pos) return track_circuit_breaks[pts] end @@ -264,227 +329,636 @@ function ildb.get_tcbs(sigd) return tcb[sigd.s] end - -function ildb.create_ts(sigd) - local tcbs = ildb.get_tcbs(sigd) - local id = advtrains.random_id() - - while track_sections[id] do - id = advtrains.random_id() - end - - track_sections[id] = { - name = "Section "..id, - tc_breaks = { sigd } - } - tcbs.ts_id = id -end - function ildb.get_ts(id) return track_sections[id] end +-- retrieve full tables. Please use only read-only! +function ildb.get_all_tcb() + return track_circuit_breaks +end +function ildb.get_all_ts() + return track_sections +end - --- various helper functions handling sigd's -local sigd_equal = advtrains.interlocking.sigd_equal -local function insert_sigd_nodouble(list, sigd) - for idx, cmp in pairs(list) do - if sigd_equal(sigd, cmp) then - return - end +function tsrepair_notify(notify_pname, ...) + if notify_pname then + minetest.chat_send_player(notify_pname, advtrains.print_concat_table({"TS Check:",...})) end - table.insert(list, sigd) end - --- This function will actually handle the node that is in connid direction from the node at pos --- so, this needs the conns of the node at pos, since these are already calculated -local function traverser(found_tcbs, pos, conns, connid, count, brk_when_found_n) - local adj_pos, adj_connid, conn_idx, nextrail_y, next_conns = advtrains.get_adjacent_rail(pos, conns, connid, advtrains.all_tracktypes) - if not adj_pos then - --atdebug("Traverser found end-of-track at",pos, connid) - return +-- Checks the consistency of the track section at the given position, attempts to autorepair track sections if they are inconsistent +-- There are 2 operation modes: +-- 1: pos is NOT a TCB, tcb_connid MUST be nil +-- 2: pos is a TCB, tcb_connid MUST be given +-- @param pos: the position to start from +-- @param tcb_connid: If provided node is a TCB, the direction in which to search +-- @param notify_pname: the player to notify about reparations +-- Returns: +-- ts_id - the track section that was found +-- nil - No track section exists +function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname, force_create) + --atdebug("check_and_repair_ts_at_pos", pos, tcb_connid) + -- check prereqs + if ildb.get_tcb(pos) then + if not tcb_connid then error("check_and_repair_ts_at_pos: Startpoint is TCB, must provide tcb_connid!") end + else + -- FIX 2025-01-07: If the checked pos is not a TCB, we always need to search in both directions, otherwise we errorneously split a ts + tcb_connid = nil end - -- look whether there is a TCB here - if #next_conns == 2 then --if not, don't even try! - local tcb = ildb.get_tcb(adj_pos) - if tcb then - -- done with this branch - --atdebug("Traverser found tcb at",adj_pos, adj_connid) - insert_sigd_nodouble(found_tcbs, {p=adj_pos, s=adj_connid}) - return + -- STEP 1: Ensure that only one section is at this place + -- get all TCBs adjacent to this + local all_tcbs = ildb.get_all_tcbs_adjacent(pos, tcb_connid) + local first_ts = true + local ts_id + for _,sigd in ipairs(all_tcbs) do + ildb.tcbs_ensure_ts_ref_exists(sigd) + local tcbs_ts_id = sigd.tcbs.ts_id + if first_ts then + -- this one determines + ts_id = tcbs_ts_id + first_ts = false + else + -- these must be the same as the first + if ts_id ~= tcbs_ts_id then + -- inconsistency is found, repair it + --atdebug("check_and_repair_ts_at_pos: Inconsistency is found!") + tsrepair_notify(notify_pname, S("Track section inconsistent here, repairing...")) + return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname) + -- Step2 check is no longer necessary since we just created that new section + end end end - -- recursion abort condition - if count > TRAVERSER_LIMIT then - --atdebug("Traverser hit counter at",adj_pos, adj_connid) - return true - end - -- continue traversing - local counter_hit = false - for nconnid, nconn in ipairs(next_conns) do - if adj_connid ~= nconnid then - counter_hit = counter_hit or traverser(found_tcbs, adj_pos, next_conns, nconnid, count + 1, brk_when_found_n) - if brk_when_found_n and #found_tcbs>=brk_when_found_n then - break - end + -- only one found (it is either nil or a ts id) + --atdebug("check_and_repair_ts_at_pos: TS consistent id=",ts_id,"") + if not ts_id then + if force_create and next(all_tcbs) then --ensure at least one tcb is in list + return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname) + else + --tsrepair_notify(notify_pname, "No track section found here.") + return nil + -- All TCBs agreed that there is no section here end end - return counter_hit + + local ts = ildb.get_ts(ts_id) + if not ts then + -- This branch may never be reached, because ildb.tcbs_ensure_ts_ref_exists(sigd) is already supposed to clear out missing sections + error("check_and_repair_ts_at_pos: Resolved to nonexisting section although ildb.tcbs_ensure_ts_ref_exists(sigd) was supposed to prevent this. Panic!") + end + ildb.purge_ts_tcb_refs(ts_id) + -- STEP 2: Ensure that all_tcbs is equal to the track section's TCB list. If there are extra TCBs then the section should be split + -- ildb.tcbs_ensure_ts_ref_exists(sigd) has already make sure that all tcbs are found in the ts's tc_breaks list + -- That means it is sufficient to compare the LENGTHS of both lists, if one is longer then it is inconsistent + if #ts.tc_breaks ~= #all_tcbs then + --atdebug("check_and_repair_ts_at_pos: Partition is found!") + tsrepair_notify(notify_pname, S("Track section partition found, repairing...")) + return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname) + end + --tsrepair_notify(notify_pname, "Found section", ts.name or ts_id, "here.") + ildb.update_rs_cache(ts_id) + return ts_id end +-- Helper function to prevent duplicates +local function insert_sigd_if_not_present(tab, sigd) + local found = false + for _, ssigd in ipairs(tab) do + if vector.equals(sigd.p, ssigd.p) and sigd.s==ssigd.s then + found = true + end + end + if not found then + table.insert(tab, sigd) + end + return not found +end - --- Merges the TS with merge_id into root_id and then deletes merge_id -local function merge_ts(root_id, merge_id) - local rts = ildb.get_ts(root_id) - local mts = ildb.get_ts(merge_id) - if not mts then return end -- This may be the case when sync_tcb_neighbors - -- inserts the same id twice. do nothing. - - if not ildb.may_modify_ts(rts) then return false end - if not ildb.may_modify_ts(mts) then return false end - - -- cobble together the list of TCBs - for _, msigd in ipairs(mts.tc_breaks) do - local tcbs = ildb.get_tcbs(msigd) - if tcbs then - insert_sigd_nodouble(rts.tc_breaks, msigd) - tcbs.ts_id = root_id +-- Starting from a position, search all TCBs that can be reached from this position. +-- In a non-faulty setup, all of these should have the same track section assigned. +-- This function does not trigger a repair. +-- @param inipos: the initial position +-- @param inidir: the initial direction, or nil to search in all directions +-- @param per_track_callback: A callback function called with signature (pos, connid, bconnid) for every track encountered +-- Returns: a list of sigd's describing the TCBs found (sigd's point inward): +-- {p=<pos>, s=<side>, tcbs=<ref to tcbs table>} +function ildb.get_all_tcbs_adjacent(inipos, inidir, per_track_callback) + --atdebug("get_all_tcbs_adjacent: inipos",inipos,"inidir",inidir,"") + local found_sigd = {} + local ti = advtrains.get_track_iterator(inipos, inidir, TS_MAX_SCAN, true) + -- if initial start is TCBS and has xlink, need to add that to the TI + local inisi = {p=inipos, s=inidir}; + local initcbs = ildb.get_tcbs(inisi) + if initcbs then + ildb.validate_tcb_xlink(inisi, true) + if initcbs.xlink then + -- adding the tcb will happen when this branch is retrieved again using ti:next_branch() + --atdebug("get_all_tcbs_adjacent: Putting xlink Branch for initial node",initcbs.xlink) + ti:add_branch(initcbs.xlink.p, initcbs.xlink.s) end - advtrains.interlocking.show_tcb_marker(msigd.p) end - -- done - track_sections[merge_id] = nil + local pos, connid, bconnid, tcb + while ti:has_next_branch() do + pos, connid = ti:next_branch() + --atdebug("get_all_tcbs_adjacent: BRANCH: ",pos, connid) + bconnid = nil + local is_branch_start = true + repeat + -- callback + if per_track_callback then + per_track_callback(pos, connid, bconnid) + end + tcb = ildb.get_tcb(pos) + if tcb then + local using_connid = bconnid + -- found a tcb + if is_branch_start then + -- A branch cannot be a TCB, as that would imply that it was a turnout/crossing (illegal) + -- UNLESS: (a) it is the start point or (b) it was added via xlink + -- Then the correct conn to use is connid (pointing forward) + --atdebug("get_all_tcbs_adjacent: Inserting TCB at branch start",pos, connid) + using_connid = connid + end + -- add the sigd of this tcb and a reference to the tcb table in it + --atdebug("get_all_tcbs_adjacent: Found TCB: ",pos, using_connid, "ts=", tcb[using_connid].ts_id) + local si = {p=pos, s=using_connid, tcbs=tcb[using_connid]} + -- if xlink exists, add it now (only if we are not in branch start) + ildb.validate_tcb_xlink(si, true) + if not is_branch_start and si.tcbs.xlink then + -- adding the tcb will happen when this branch is retrieved again using ti:next_branch() + --atdebug("get_all_tcbs_adjacent: Putting xlink Branch",si.tcbs.xlink) + ti:add_branch(si.tcbs.xlink.p, si.tcbs.xlink.s) + end + insert_sigd_if_not_present(found_sigd, si) + if not is_branch_start then + break + end + end + pos, connid, bconnid = ti:next_track() + is_branch_start = false + --atdebug("get_all_tcbs_adjacent: TRACK: ",pos, connid, bconnid) + until not pos + end + return found_sigd end -local lntrans = { "A", "B" } -local function sigd_to_string(sigd) - return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s] +-- Called by frontend functions when multiple tcbs's that logically belong to one section have been determined to have different sections +-- Parameter is the output of ildb.get_all_tcbs_adjacent(pos) +-- Returns the ID of the track section that results after the merge +function ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname) + --atdebug("repair_ts_merge_all: Instructed to merge sections of following TCBs:") + -- The first loop does the following for each TCBS: + -- a) Store the TS ID in the set of TS to update + -- b) Set the TS ID to nil, so that the TCBS gets removed from the section + local ts_to_update = {} + local ts_name_repo = {} + local any_ts = false + for _,sigd in ipairs(all_tcbs) do + local ts_id = sigd.tcbs.ts_id + --atdebug(sigd, "ts=", ts_id) + if ts_id then + local ts = track_sections[ts_id] + if ts then + any_ts = true + ts_to_update[ts_id] = true + -- if nonstandard name, store this + if ts.name and not string.match(ts.name, "^Section") then + ts_name_repo[#ts_name_repo+1] = ts.name + end + end + end + sigd.tcbs.ts_id = nil + end + if not any_ts and not force_create then + -- nothing to do at all, just no interlocking. Why were we even called + --atdebug("repair_ts_merge_all: No track section present, will not create a new one") + return nil + end + -- Purge every TS in turn. TS's that are now empty will be deleted. TS's that still have TCBs will be kept + for ts_id, _ in pairs(ts_to_update) do + local remain_ts = ildb.purge_ts_tcb_refs(ts_id) + end + -- Create a new fresh track section with all the TCBs we have in our collection + local new_ts_id, new_ts = ildb.create_ts_from_tcb_list(all_tcbs) + tsrepair_notify(notify_pname, S("Created track section @1 from @2 TCBs", new_ts_id, #all_tcbs)) + return new_ts_id end --- Check for near TCBs and connect to their TS if they have one, and syncs their data. -function ildb.sync_tcb_neighbors(pos, connid) - local found_tcbs = { {p = pos, s = connid} } - local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) - if not node_ok then - atwarn("update_tcb_neighbors but node is NOK: "..minetest.pos_to_string(pos)) - return +-- For the specified TS, go through the list of TCBs and purge all TCBs that have no corresponding backreference in their TCBS table. +-- If the track section ends up empty, it is deleted in this process. +-- Should the track section still exist after the purge operation, it is returned. +function ildb.purge_ts_tcb_refs(ts_id) + local ts = track_sections[ts_id] + if not ts then + return nil end - - --atdebug("Traversing from ",pos, connid) - local counter_hit = traverser(found_tcbs, pos, conns, connid, 0) - - local ts_id - local list_eoi = {} - local list_ok = {} - local list_mismatch = {} - local ts_to_merge = {} - - for idx, sigd in pairs(found_tcbs) do + local has_changed = false + local i = 1 + while ts.tc_breaks[i] do + -- get TCBS + local sigd = ts.tc_breaks[i] local tcbs = ildb.get_tcbs(sigd) - if not tcbs.ts_id then - --atdebug("Sync: put",sigd_to_string(sigd),"into list_eoi") - table.insert(list_eoi, sigd) - elseif not ts_id and tcbs.ts_id then - if not ildb.get_ts(tcbs.ts_id) then - atwarn("Track section database is inconsistent, there's no TS with ID=",tcbs.ts_id) - tcbs.ts_id = nil - table.insert(list_eoi, sigd) + if tcbs then + if tcbs.ts_id == ts_id then + -- this one is legit + i = i+1 else - --atdebug("Sync: put",sigd_to_string(sigd),"into list_ok") - ts_id = tcbs.ts_id - table.insert(list_ok, sigd) + -- this one is to be purged + --atdebug("purge_ts_tcb_refs(",ts_id,"): purging",sigd,"(backreference = ",tcbs.ts_id,")") + table.remove(ts.tc_breaks, i) + has_changed = true end - elseif ts_id and tcbs.ts_id and tcbs.ts_id ~= ts_id then - atwarn("Track section database is inconsistent, sections share track!") - atwarn("Merging",tcbs.ts_id,"into",ts_id,".") - table.insert(list_mismatch, sigd) - table.insert(ts_to_merge, tcbs.ts_id) + else + -- if not tcbs: was anyway an orphan, remove it + --atdebug("purge_ts_tcb_refs(",ts_id,"): purging",sigd,"(referred nonexisting TCB)") + table.remove(ts.tc_breaks, i) + has_changed = true end end - if ts_id then - local ts = ildb.get_ts(ts_id) - for _, sigd in ipairs(list_eoi) do - local tcbs = ildb.get_tcbs(sigd) - tcbs.ts_id = ts_id - table.insert(ts.tc_breaks, sigd) - advtrains.interlocking.show_tcb_marker(sigd.p) - end - for _, mts in ipairs(ts_to_merge) do - merge_ts(ts_id, mts) + if #ts.tc_breaks == 0 then + -- remove the section completely + --atdebug("purge_ts_tcb_refs(",ts_id,"): after purging, the section is empty, is being deleted") + track_sections[ts_id] = nil + return nil + else + if has_changed then + -- needs to update route cache + ildb.update_rs_cache(ts_id) end + return ts end end -function ildb.link_track_sections(merge_id, root_id) - if merge_id == root_id then +-- For the specified TCBS, make sure that the track section referenced by it +-- (a) exists and +-- (b) has a backreference to this TCBS stored in its tc_breaks list +function ildb.tcbs_ensure_ts_ref_exists(sigd) + local tcbs = sigd.tcbs or ildb.get_tcbs(sigd) + if not tcbs or not tcbs.ts_id then return end + local ts = ildb.get_ts(tcbs.ts_id) + if not ts then + --atdebug("tcbs_ensure_ts_ref_exists(",sigd,"): TS does not exist, setting to nil") + -- TS is deleted, clear own ts id + tcbs.ts_id = nil return end - merge_ts(root_id, merge_id) + local did_insert = insert_sigd_if_not_present(ts.tc_breaks, {p=sigd.p, s=sigd.s}) + if did_insert then + --atdebug("tcbs_ensure_ts_ref_exists(",sigd,"): TCBS was missing reference in TS",tcbs.ts_id) + ildb.update_rs_cache(tcbs.ts_id) + end end -function ildb.remove_from_interlocking(sigd) - local tcbs = ildb.get_tcbs(sigd) - if not ildb.may_modify_tcbs(tcbs) then return false end +function ildb.create_ts_from_tcb_list(sigd_list) + local id = advtrains.random_id(8) - if tcbs.ts_id then - local tsid = tcbs.ts_id - local ts = ildb.get_ts(tsid) - if not ts then - tcbs.ts_id = nil - return true + while track_sections[id] do + id = advtrains.random_id(8) + end + --atdebug("create_ts_from_tcb_list: sigd_list=",sigd_list, "new ID will be ",id) + + local tcbr = {} + -- makes a copy of the sigd list, for use in repair mechanisms where sigd may contain a tcbs field which we dont want + for _, sigd in ipairs(sigd_list) do + table.insert(tcbr, {p=sigd.p, s=sigd.s}) + local tcbs = sigd.tcbs or ildb.get_tcbs(sigd) + if tcbs.ts_id then + error("Trying to create TS with TCBS that is already assigned to other section") end - - -- remove entry from the list - local idx = 1 - while idx <= #ts.tc_breaks do - local cmp = ts.tc_breaks[idx] - if sigd_equal(sigd, cmp) then - table.remove(ts.tc_breaks, idx) + tcbs.ts_id = id + end + + local new_ts = { + tc_breaks = tcbr + } + track_sections[id] = new_ts + -- update the TCB markers + for _, sigd in ipairs(sigd_list) do + advtrains.interlocking.show_tcb_marker(sigd.p) + end + + + ildb.update_rs_cache(id) + return id, new_ts +end + +-- RS CACHE -- + +--[[ +node_from_to_list - cache of from-to connid mappings and their associated state. +Acts like a cache, built on demand by ildb.get_possible_out_connids(nodename) +node_name = { + from_connid = { + to_connid = state + } +} +]] +local node_from_to_state_cache = {} + +function ildb.get_possible_out_connids(node_name, in_connid) + if not node_from_to_state_cache[node_name] then + node_from_to_state_cache[node_name] = {} + end + local nt = node_from_to_state_cache[node_name] + if not nt[in_connid] then + local ta = {} + --atdebug("Node From/To State Cache: Caching for ",node_name,"connid",in_connid) + local ndef = minetest.registered_nodes[node_name] + if ndef.advtrains.node_state_map then + for state, tnode in pairs(ndef.advtrains.node_state_map) do + local tndef = minetest.registered_nodes[tnode] + -- verify that the conns table is identical - this is purely to catch setup errors! + if not tndef.at_conns or not tndef.at_conn_map then + --atdebug("ndef:",ndef,", tndef:",tndef) + error("In AT setup for node "..tnode..": Node set as state "..state.." of "..node_name.." in state_map, but is missing at_conns/at_conn_map!") + end + if #ndef.at_conns ~= #tndef.at_conns then + --atdebug("ndef:",ndef,", tndef:",tndef) + error("In AT setup for node "..tnode..": Conns table does not match that of "..node_name.." (of which this is state "..state..")") + end + for connid=1,#ndef.at_conns do + if ndef.at_conns[connid].c ~= tndef.at_conns[connid].c then + --atdebug("ndef:",ndef,", tndef:",tndef) + error("In AT setup for node "..tnode..": Conns table does not match that of "..node_name.." (of which this is state "..state..")") + end + end + -- do the actual caching by looking at the conn_map + local target_connid = tndef.at_conn_map[in_connid] + if ta[target_connid] then + -- Select the variant for which the other way would back-connect. This way, turnouts will switch to the appropriate branch if the train joins + local have_back_conn = (tndef.at_conn_map[target_connid])==in_connid + --atdebug("Found second state mapping",in_connid,"-",target_connid,"have_back_conn=",have_back_conn) + if have_back_conn then + --atdebug("Overwriting",in_connid,"-",target_connid,"=",state) + ta[target_connid] = state + end + else + --atdebug("Setting",in_connid,"-",target_connid,"=",state) + ta[target_connid] = state + end + end + else + error("Node From/To State Cache: "..node_name.." doesn't have a state map, is not a switchable track! Panic!") + end + nt[in_connid] = ta + end + return nt[in_connid] +end + +local function recursively_find_routes(s_pos, s_connid, locks_found, result_table, scan_limit) + --atdebug("Recursively restarting at ",s_pos, s_connid, "limit left", scan_limit) + local ti = advtrains.get_track_iterator(s_pos, s_connid, scan_limit, false) + local pos, connid, bconnid = ti:next_branch() + pos, connid, bconnid = ti:next_track()-- step once to get ahead of previous turnout + local last_pos + while pos do -- this stops the loop when either the track end is reached or the limit is hit + local node = advtrains.ndb.get_node_or_nil(pos) + --atdebug("Walk ",pos, "nodename", node.name, "entering at conn",bconnid) + local ndef = minetest.registered_nodes[node.name] + if ndef.advtrains and ndef.advtrains.node_state_map then + -- Stop, this is a switchable node. Find out which conns we can go at + --atdebug("Found turnout ",pos, "nodename", node.name, "entering at conn",bconnid) + local pts = advtrains.encode_pos(pos) + if locks_found[pts] then + -- we've been here before. Stop + --atdebug("Was already seen! returning") + return + end + local out_conns = ildb.get_possible_out_connids(node.name, bconnid) + -- note 2025-01-06: get_possible_out_connids contains some logic so that the correct switch state is selected even if the turnout is entered from the branch side (see "have_back_conn") + for oconnid, state in pairs(out_conns) do + --atdebug("Going in direction",oconnid,"state",state) + locks_found[pts] = state + recursively_find_routes(pos, oconnid, locks_found, result_table, ti.limit) + locks_found[pts] = nil + end + return + end + --otherwise, this might be a tcb + local tcb = ildb.get_tcb(pos) + if tcb then + -- we found a tcb, store the current locks in the result_table + local end_pkey = advtrains.encode_pos(pos) + --atdebug("Found end TCB", pos, end_pkey,", returning") + if result_table[end_pkey] then + --atwarn("While caching track section routing, found multiple route paths within same track section. Only first one found will be used") + -- this warning appears too often and is typically harmless else - idx = idx + 1 + result_table[end_pkey] = table.copy(locks_found) end + return end - tcbs.ts_id = nil - - --ildb.sync_tcb_neighbors(sigd.p, sigd.s) + -- Go forward + last_pos = pos + pos, connid, bconnid = ti:next_track() + end + --atdebug("recursively_find_routes: Reached track end or limit at", last_pos, ". This path is not saved, returning") +end + +-- Updates the turnout cache of the given track section +function ildb.update_rs_cache(ts_id) + local ts = ildb.get_ts(ts_id) + if not ts then + error("Update TS Cache called with nonexisting ts_id "..(ts_id or "nil")) + end + local rscache = {} + --atdebug("== Running update_rs_cache for ",ts_id) + -- start on every of the TS's TCBs, walk the track forward and store locks along the way + for start_tcbi, start_tcbs in ipairs(ts.tc_breaks) do + start_pkey = advtrains.encode_pos(start_tcbs.p) + rscache[start_pkey] = {} + --atdebug("Starting for ",start_tcbi, start_tcbs) + local locks_found = {} + local result_table = {} - if #ts.tc_breaks == 0 then - track_sections[tsid] = nil + recursively_find_routes(start_tcbs.p, start_tcbs.s, locks_found, result_table, TS_MAX_SCAN) + -- now result_table contains found route locks. Match them with the other TCBs we have in this section + for end_tcbi, end_tcbs in ipairs(ts.tc_breaks) do + if end_tcbi ~= start_tcbi then + end_pkey = advtrains.encode_pos(end_tcbs.p) + if result_table[end_pkey] then + --atdebug("Set RSCache entry",end_pkey.."-"..end_pkey,"=",result_table[end_pkey]) + local lockstab = result_table[end_pkey] + if ts.fixed_locks then -- include the sections fixedlocks if present + for pts, st in pairs(ts.fixed_locks) do lockstab[pts] = st end + end + rscache[start_pkey][end_pkey] = lockstab + result_table[end_pkey] = nil + end + end end + -- warn about superfluous entry + --for sup_end_pkey, sup_entry in pairs(result_table) do + -- atwarn("In update_rs_cache for section",ts_id,"found superfluous endpoint",sup_end_pkey,"->",sup_entry) + --end -- this warning appears too often and is typically harmless end - advtrains.interlocking.show_tcb_marker(sigd.p) - if tcbs.signal then - return false - end - return true + ts.rs_cache = rscache + --atdebug("== Done update_rs_cache for ",ts_id, "result:",rscache) end -function ildb.remove_tcb(pos) - local pts = advtrains.roundfloorpts(pos) - if not track_circuit_breaks[pts] then - return true --FIX: not an error, because tcb is already removed - end + +--- DB API functions + +local lntrans = { "A", "B" } +function ildb.sigd_to_string(sigd) + return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s] +end + +-- Create a new TCB at the position and update/repair the adjoining sections +function ildb.create_tcb_at(pos) + --atdebug("create_tcb_at",pos) + local pts = advtrains.encode_pos(pos) + track_circuit_breaks[pts] = {[1] = {}, [2] = {}} + local all_tcbs_1 = ildb.get_all_tcbs_adjacent(pos, 1) + --atdebug("TCBs on A side",all_tcbs_1) + local all_tcbs_2 = ildb.get_all_tcbs_adjacent(pos, 2) + --atdebug("TCBs on B side",all_tcbs_2) + -- perform TS repair + ildb.repair_ts_merge_all(all_tcbs_1, false) + ildb.repair_ts_merge_all(all_tcbs_2, false) +end + +-- Remove TCB at the position and update/repair the now joined section +-- skip_tsrepair: should be set to true when the rail node at the TCB position is already gone. +-- Assumes the track sections are now separated and does not attempt the repair process. +function ildb.remove_tcb_at(pos, pname, skip_tsrepair) + --atdebug("remove_tcb_at",pos) + local pts = advtrains.encode_pos(pos) + local old_tcb = track_circuit_breaks[pts] + -- unassign signals if defined for connid=1,2 do - if not ildb.remove_from_interlocking({p=pos, s=connid}) then - return false + if old_tcb[connid].signal then + ildb.set_sigd_for_signal(old_tcb[connid].signal, nil) end end track_circuit_breaks[pts] = nil + -- purge the track sections adjacent + if old_tcb[1].ts_id then + ildb.purge_ts_tcb_refs(old_tcb[1].ts_id) + end + if old_tcb[2].ts_id then + ildb.purge_ts_tcb_refs(old_tcb[2].ts_id) + end + -- update xlink partners + if old_tcb[1].xlink then + ildb.validate_tcb_xlink(old_tcb[1].xlink) + end + if old_tcb[2].xlink then + ildb.validate_tcb_xlink(old_tcb[2].xlink) + end + advtrains.interlocking.remove_tcb_marker(pos) + -- If needed, merge the track sections here + if not skip_tsrepair then + ildb.check_and_repair_ts_at_pos(pos, nil, pname) + end return true end -function ildb.dissolve_ts(ts_id) - local ts = ildb.get_ts(ts_id) - if not ildb.may_modify_ts(ts) then return false end - local tcbr = advtrains.merge_tables(ts.tc_breaks) - for _,sigd in ipairs(tcbr) do - ildb.remove_from_interlocking(sigd) +-- Xlink: Connecting not-physically-connected sections handling + +-- Ensures that the xlink of this tcbs is bidirectional +function ildb.validate_tcb_xlink(sigd, suppress_repairs) + local tcbs = sigd.tcbs or ildb.get_tcbs(sigd) + local osigd = tcbs.xlink + if not osigd then return end + local otcbs = ildb.get_tcbs(tcbs.xlink) + if not otcbs then + --atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"orphaned") + tcbs.xlink = nil + if not suppress_repairs then + ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s) + end + return + end + if otcbs.xlink then + if not vector.equals(otcbs.xlink.p, sigd.p) or otcbs.xlink.s~=sigd.s then + --atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"backreferencing to someone else (namely",otcbs.xlink,") clearing it") + tcbs.xlink = nil + if not suppress_repairs then + ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s) + --atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd," was backreferencing to someone else, now updating that") + ildb.validate_tcb_xlink(osigd) + end + end + else + --atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"wasn't backreferencing, clearing it") + tcbs.xlink = nil + if not suppress_repairs then + ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s) + end end - -- Note: ts gets removed in the moment of the removal of the last TCB. - return true +end + +function ildb.add_tcb_xlink(sigd1, sigd2) + --("add_tcb_xlink",sigd1, sigd2) + local tcbs1 = sigd1.tcbs or ildb.get_tcbs(sigd1) + local tcbs2 = sigd2.tcbs or ildb.get_tcbs(sigd2) + if vector.equals(sigd1.p, sigd2.p) then + --atdebug("add_tcb_xlink Cannot xlink with same TCB") + return + end + if not tcbs1 or not tcbs2 then + --atdebug("add_tcb_xlink TCBS doesnt exist") + return + end + if tcbs1.xlink or tcbs2.xlink then + --atdebug("add_tcb_xlink One already linked") + return + end + -- apply link + tcbs1.xlink = {p=sigd2.p, s=sigd2.s} + tcbs2.xlink = {p=sigd1.p, s=sigd1.s} + -- update section. It should be sufficient to call update only once because the TCBs are linked anyway now + ildb.check_and_repair_ts_at_pos(sigd1.p, sigd1.s) +end + +function ildb.remove_tcb_xlink(sigd) + --atdebug("remove_tcb_xlink",sigd) + -- Validate first. If Xlink is gone already then, nothing to do + ildb.validate_tcb_xlink(sigd) + -- Checking all of these already done by validate + local tcbs = sigd.tcbs or ildb.get_tcbs(sigd) + local osigd = tcbs.xlink + if not osigd then + -- validate already cleared us + --atdebug("remove_tcb_xlink: Already gone by validate") + return + end + local otcbs = ildb.get_tcbs(tcbs.xlink) + -- clear it + otcbs.xlink = nil + tcbs.xlink = nil + -- Update section for ourself and the other one + ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s) + ildb.check_and_repair_ts_at_pos(osigd.p, osigd.s) +end + +function ildb.create_ts_from_tcbs(sigd) + --atdebug("create_ts_from_tcbs",sigd) + local all_tcbs = ildb.get_all_tcbs_adjacent(sigd.p, sigd.s) + ildb.repair_ts_merge_all(all_tcbs, true) +end + +-- Remove the given track section, leaving its TCBs with no section assigned +function ildb.remove_ts(ts_id) + --atdebug("remove_ts",ts_id) + local ts = track_sections[ts_id] + if not ts then + error("remove_ts: "..ts_id.." doesn't exist") + end + while ts.tc_breaks[i] do + -- get TCBS + local sigd = ts.tc_breaks[i] + local tcbs = ildb.get_tcbs(sigd) + if tcbs then + --atdebug("cleared TCB",sigd) + tcbs.ts_id = nil + else + --atdebug("orphan TCB",sigd) + end + i = i+1 + end + track_sections[ts_id] = nil end -- Returns true if it is allowed to modify any property of a track section, such as @@ -509,38 +983,8 @@ function ildb.may_modify_tcbs(tcbs) return true end --- Utilize the traverser to find the track section at the specified position --- Returns: --- ts_id, origin - the first found ts and the sigd of the found tcb --- nil - there were no TCBs in TRAVERSER_MAX range of the position --- false - the first found TCB stated End-Of-Interlocking, or track ends were reached -function ildb.get_ts_at_pos(pos) - local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) - if not node_ok then - error("get_ts_at_pos but node is NOK: "..minetest.pos_to_string(pos)) - end - local limit_hit = false - local found_tcbs = {} - for connid, conn in ipairs(conns) do -- Note: a breadth-first-search would be better for performance - limit_hit = limit_hit or traverser(found_tcbs, pos, conns, connid, 0, 1) - if #found_tcbs >= 1 then - local tcbs = ildb.get_tcbs(found_tcbs[1]) - local ts - if tcbs.ts_id then - return tcbs.ts_id, found_tcbs[1] - else - return false - end - end - end - if limit_hit then - -- there was at least one limit hit - return nil - else - -- all traverser ends were track ends - return false - end -end + +-- Signals/IP -- -- returns the sigd the signal at pos belongs to, if this is known @@ -556,11 +1000,34 @@ function ildb.get_sigd_for_signal(pos) end return nil end -function ildb.set_sigd_for_signal(pos, sigd) +function ildb.set_sigd_for_signal(pos, sigd) -- do not use! local pts = advtrains.roundfloorpts(pos) signal_assignments[pts] = sigd end +-- Assign the signal at pos to the given TCB side. +function ildb.assign_signal_to_tcbs(pos, sigd) + local tcbs = ildb.get_tcbs(sigd) + assert(tcbs, "assign_signal_to_tcbs invalid sigd!") + tcbs.signal = pos + if not tcbs.routes then + tcbs.routes = {} + end + ildb.set_sigd_for_signal(pos, sigd) +end + +-- unassign the signal from the given sigd (looks in tcbs.signal for the signalpos) +function ildb.unassign_signal_for_tcbs(sigd) + local tcbs = advtrains.interlocking.db.get_tcbs(sigd) + if not tcbs then return end + local pos = tcbs.signal + if not pos then return end + ildb.set_sigd_for_signal(pos, nil) + tcbs.signal = nil + tcbs.route_aspect = nil + tcbs.route_remote = nil +end + -- checks if there's any influence point set to this position -- if purge is true, checks whether the associated signal still exists -- and deletes the ip if not. @@ -570,7 +1037,7 @@ function ildb.is_ip_at(pos, purge) if purge then -- is there still a signal assigned to it? for connid, sigpos in pairs(influence_points[pts]) do - local asp = advtrains.interlocking.signal_get_aspect(sigpos) + local asp = advtrains.interlocking.signal.get_aspect_info(sigpos) if not asp then atlog("Clearing orphaned signal influence point", pts, "/", connid) ildb.clear_ip_signal(pts, connid) @@ -597,7 +1064,7 @@ end function ildb.get_ip_signal_asp(pts, connid) local p = ildb.get_ip_signal(pts, connid) if p then - local asp = advtrains.interlocking.signal_get_aspect(p) + local asp = advtrains.interlocking.signal.get_aspect_info(p) if not asp then atlog("Clearing orphaned signal influence point", pts, "/", connid) ildb.clear_ip_signal(pts, connid) @@ -634,6 +1101,28 @@ function ildb.get_ip_by_signalpos(spos) end end end +function ildb.check_for_duplicate_ip(spos) + local main_ip_found = false + -- first pass: check for duplicates + for pts,tab in pairs(influence_points) do + for connid,pos in pairs(tab) do + if vector.equals(pos, spos) then + if main_ip_found then + atwarn("Signal at",spos,": Deleting duplicate signal influence point at",pts,"/",connid) + tab[connid] = nil + end + main_ip_found = true + end + end + end + -- second pass: delete empty tables + for pts,tab in pairs(influence_points) do + if not tab[1] and not tab[2] then -- only those two connids may exist + influence_points[pts] = nil + end + end +end + -- clear signal assignment given the signal position function ildb.clear_ip_by_signalpos(spos) local pts, connid = ildb.get_ip_by_signalpos(spos) diff --git a/advtrains_interlocking/demosignals.lua b/advtrains_interlocking/demosignals.lua deleted file mode 100644 index 1c1b8b2..0000000 --- a/advtrains_interlocking/demosignals.lua +++ /dev/null @@ -1,97 +0,0 @@ --- Demonstration signals --- Those can display the 3 main aspects of Ks signals - --- Note that the group value of advtrains_signal is 2, which means "step 2 of signal capabilities" --- advtrains_signal=1 is meant for signals that do not implement set_aspect. - - -local setaspect = function(pos, node, asp) - if asp.main == 0 then - advtrains.ndb.swap_node(pos, {name="advtrains_interlocking:ds_danger"}) - else - if asp.dst ~= 0 and asp.main == -1 then - advtrains.ndb.swap_node(pos, {name="advtrains_interlocking:ds_free"}) - else - advtrains.ndb.swap_node(pos, {name="advtrains_interlocking:ds_slow"}) - end - end - local meta = minetest.get_meta(pos) - if meta then - meta:set_string("infotext", minetest.serialize(asp)) - end -end - -local suppasp = { - main = {0, 6, -1}, - dst = {0, false}, - shunt = false, - proceed_as_main = true, - info = { - call_on = false, - dead_end = false, - w_speed = nil, - } -} - -minetest.register_node("advtrains_interlocking:ds_danger", { - description = "Demo signal at Danger", - tiles = {"at_il_signal_asp_danger.png"}, - groups = { - cracky = 3, - advtrains_signal = 2, - save_in_at_nodedb = 1, - }, - advtrains = { - set_aspect = setaspect, - supported_aspects = suppasp, - get_aspect = function(pos, node) - return advtrains.interlocking.DANGER - end, - }, - on_rightclick = advtrains.interlocking.signal_rc_handler, - can_dig = advtrains.interlocking.signal_can_dig, - after_dig_node = advtrains.interlocking.signal_after_dig, -}) -minetest.register_node("advtrains_interlocking:ds_free", { - description = "Demo signal at Free", - tiles = {"at_il_signal_asp_free.png"}, - groups = { - cracky = 3, - advtrains_signal = 2, - save_in_at_nodedb = 1, - }, - advtrains = { - set_aspect = setaspect, - supported_aspects = suppasp, - get_aspect = function(pos, node) - return { - main = -1, - } - end, - }, - on_rightclick = advtrains.interlocking.signal_rc_handler, - can_dig = advtrains.interlocking.signal_can_dig, - after_dig_node = advtrains.interlocking.signal_after_dig, -}) -minetest.register_node("advtrains_interlocking:ds_slow", { - description = "Demo signal at Slow", - tiles = {"at_il_signal_asp_slow.png"}, - groups = { - cracky = 3, - advtrains_signal = 2, - save_in_at_nodedb = 1, - }, - advtrains = { - set_aspect = setaspect, - supported_aspects = suppasp, - get_aspect = function(pos, node) - return { - main = 6, - } - end, - }, - on_rightclick = advtrains.interlocking.signal_rc_handler, - can_dig = advtrains.interlocking.signal_can_dig, - after_dig_node = advtrains.interlocking.signal_after_dig, -}) - diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua index a2f5882..c30a22f 100644 --- a/advtrains_interlocking/init.lua +++ b/advtrains_interlocking/init.lua @@ -1,8 +1,16 @@ --- Advtrains interlocking system --- See database.lua for a detailed explanation +--- Advtrains interlocking system. +-- @module advtrains.interlocking advtrains.interlocking = {} +-- Initialize internationalization (using ywang's poconvert) +advtrains.poconvert.from_flat("advtrains_interlocking") +-- ask engine for translator instance, this will load the translation files +advtrains.interlocking.translate = core.get_translator("advtrains_interlocking") + +-- Get current translator +local S = advtrains.interlocking.translate + advtrains.SHUNT_SPEED_MAX = 6 function advtrains.interlocking.sigd_equal(sigd, cmp) @@ -14,17 +22,20 @@ local modpath = minetest.get_modpath(minetest.get_current_modname()) .. DIR_DELI dofile(modpath.."database.lua") dofile(modpath.."signal_api.lua") -dofile(modpath.."demosignals.lua") +dofile(modpath.."signal_aspect_ui.lua") dofile(modpath.."train_sections.lua") dofile(modpath.."route_prog.lua") dofile(modpath.."routesetting.lua") dofile(modpath.."tcb_ts_ui.lua") dofile(modpath.."route_ui.lua") +dofile(modpath.."smartroute.lua") +dofile(modpath.."autonaming.lua") dofile(modpath.."tool.lua") dofile(modpath.."approach.lua") dofile(modpath.."ars.lua") + dofile(modpath.."tsr_rail.lua") -minetest.register_privilege("interlocking", {description = "Can set up track sections, routes and signals.", give_to_singleplayer = true}) +minetest.register_privilege("interlocking", {description = S("Can set up track sections, routes and signals"), give_to_singleplayer = true}) diff --git a/advtrains_interlocking/locale/advtrains_interlocking.de.tr b/advtrains_interlocking/locale/advtrains_interlocking.de.tr new file mode 100644 index 0000000..2c67a9f --- /dev/null +++ b/advtrains_interlocking/locale/advtrains_interlocking.de.tr @@ -0,0 +1,191 @@ +# textdomain: advtrains_interlocking +Prefix set, next signal name will be: @1=Präfix gesetzt, nächster Signalname: @1 +Prefix unset, signals are not auto-named for you!=Präfix gelöscht, automatische Signalbenennung deaktiviert! +Sets the current prefix for automatically naming interlocking components. Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on=Setze einen Präfix für die automatische Benennung von neu hinzugefügten Signalen. Beispiel: '/at_nameprefix TEST' - Signale werden mit TEST1, TEST2 usw. benannt +Created track section @1 from @2 TCBs=Gleisabschnitt @1 aus @2 TCBs erstellt +Track section inconsistent here, repairing...=Gleisabschnitt ist inkonsistent, repariere... +Track section partition found, repairing...=Gleisabschnitt partitioniert, repariere... +Can set up track sections, routes and signals=Darf Gleisabschnitte, Fahrstraßen und Signale bearbeiten +@1 Terminal @2=@1 Ziel @2 +@1 is held in @2 position when this route is set and freed =@1 wird durch die Fahrstraße in Position @2 festgelegt +@1 is no longer affected when this route is set.=@1 wird nicht mehr durch die Fahrstraße festgelegt +Added track section @1 to the route.=Gleisabschnitt @1 zur Fahrstraße hinzugefügt. +Advance to next route section=Nächsten Gleisabschnitt hinzufügen +Advance/Complete Route=Fahrstraße fortsetzen/beenden +Advancing over next section is=Fortsetzen über nächsten Gleisabschnitt hinaus +Cancel if you are unsure!=Abbrechen, wenn Sie unsicher sind! +Cancel route programming=Fahrstraßenprogrammierung abbrechen +Cannot program route without a target=Kann keine Fahrstraße ohne Ziel programmieren +End of interlocking=Ende der Zugsicherung +Enter Route Name=Fahrstraßennamen eingeben +Finish programming route=Fahrstraße abschließen +Finish route HERE=Fahrstraße HIER abschließen +Finish route at end of NEXT section=Fahrstraße am Ende des NÄCHSTEN Abschnitts abschließen +Fixed in state @1 by route @2 (punch to unfix)=Festgelegt in Zustand @1 durch Fahrstraße @2 (Schlagen um freizugeben) +Fixed in state @1 by route @2 until segment #@3 is freed.=Festgelegt in Zustand @1 durch Fahrstraße @2, bis Segment @3 freigegeben wird. +Insufficient privileges to use this!=Unzureichende Privilegien, um dies zu benutzen! +Next section is diverging (>2 TCBs)=Nächster Abschnitt enthält eine Weiche (>2 TCBs) +Route discarded.=Fahrstraße verworfen. +Route ends at signal:=Fahrstraße endet bei Signal: +Route leads into=Fahrstraße führt in +Route programming mode active. Punch TCBs to add route segments, punch turnouts to lock them.=Fahrstraßenprogrammierung aktiv. Schlage Gleisabschnittsgrenzen (TCB) um Segmente hinzuzufügen, schlage Weichen um sie festzulegen. +Route section @1 removed.=Fahrstraßenabschnitt @1 entfernt. +Routes should in most cases end at signals.=Fahrstraßen sollten normalerweise an einem Signal enden. +Save Route=Fahrstraße speichern +Step back one section=Einen Abschnitt zurück +Successfully programmed route.=Fahrstraße erfolgreich programmiert. +The origin TCB has become unknown during programming. Try again.=Der Start-TCB ist unbekannt geworden. Versuche nochmal. +This TCB is not suitable as=Diese Gleisabschnittsgrenze ist +This TCB is unconfigured, you first need to assign it to a rail=Diese Gleisabschnittsgrenze ist noch nicht konfiguiert, sie muss erst zugewiesen werden +WARNING: Route does not end at a signal.=ACHTUNG: Fahrstraße endet nicht an einem Signal. +[Route programming] =[Fahrstraßenprogrammierung] +impossible at this place.=ist hier nicht möglich. +non-interlocked area=nicht-überwachtes Gebiet +route continuation.=nicht als Fortsetzung geeignet. +<< Select a route part to edit options=<< Wähle einen Abschnitt, um Optionen zu bearbeiten +<Default Aspect>=<Standardbegriff> +ARS Rule List=ARS-Regelliste +Announce distant signal=Entferntes Hauptsignal ankündigen +Back to signal=Zurück zum Signal +Call-on (section may be occupied)=Abschnitt darf belegt sein +Clone Route=Duplizieren +Delete Route=Fahrstraße löschen +Error:=Fehler: +New From Route=Neu aus dieser FS +No Signal at this TCB=Kein Signal hier +Route name=Fahrstraßenname +Route overview=Fahrstraßenübersicht +Save ARS List=ARS-Liste speichern +Section Options:=Abschnittsoptionen: +Set=Setzen +Signal Aspect:=Signalbegriff: +TCB at @1 has different section than previous TCB=TCB bei @1 hat einen anderen Gleisabschnitt als der vorherige TCB +TCB at @1 is missing=TCB bei @1 fehlt +TCB at @1 is not assigned to previous track section=TCB bei @1 ist dem vorherigen Gleisabschnitt nicht zugewiesen +Track section after @1 missing=Gleisabschnitt nach @1 fehlt +Turnout/component missing at @1=Weiche oder Komponente bei @1 fehlt +Lock conflict at @1, Held locked by:=Sperrenkonflikt bei @1, bereits gesperrt durch: +No TCB found at @1. Please update or reconfigure route!=TCB bei @1 nicht gefunden. Bitte Fahrstraße korrigieren! +No track section adjacent to @1. Please reconfigure route!=Gleisabschnitt nach @1 nicht gefunden. Bitte Fahrstraße korrigieren! +Route @1 from signal @2=Fahrstraße @1 von Signal @2 +Route @1 from signal @2, segment #@3=Fahrstraße @1 von Signal @2, Segment @3 +Section '@1' already has route set from @2:=Abschnitt '@1' bereits durch Fahrstraße von @2 belegt: +Section '@1' is occupied!=Abschnitt '@1' ist durch einen Zug belegt! +Section '@1' not found!=Abschnitt '@1' nicht gefunden! +TCB at @1 has different section than previous TCB. Please update track section or reconfigure route!=TCB bei @1 hat anderen Abschnitt als vorhergehender TCB. Bitte Fahrstraße korrigieren! +Turnout/component missing at @1. Please update track section or reconfigure route!=Weiche/Komponente bei @1 nicht gefunden. Bitte Fahrstraße korrigieren! +<assign distant>=<entf. Hauptsignal festl.> +<none>=<kein> +Assigned distant signal to the main signal at @1=Vorsignal dem Hauptsignal bei @1 zugewiesen +Assigned signal to the TCB at @1=Signal der Gleisabschnittsgrenze bei @1 zugewiesen +Clear=Leeren +Configuring Signal: Influence point of another signal is already present!=Signal einstellen: Beeinflussungspunkt eines anderen Signals bereits vorhanden! +Configuring Signal: Node is too far away. Aborted.=Signal einstellen: Block ist zu weit entfernt. Abbruch. +Configuring Signal: Please look in train's driving direction and punch rail to set influence point.=Signal einstellen: In Fahrtrichtung schauen und Gleis schlagen, um Beeinflussungspunkt zu setzen. +Configuring Signal: Successfully set influence point=Signal einstellen: Beeinflussungspunkt erfolgreich gesetzt +Configuring Signal: This is not a normal two-connection rail! Aborted.=Signal einstellen: Dies ist kein geeignetes Gleis! Abbruch. +Dst: @1=Haupts.: @1 +Influence point is not set.=Beeinflussungspunkt ist nicht gesetzt. +Influence point is set at @1.=Beeinflussungspunkt ist gesetzt bei @1. +Modify=Bearbeiten +Set distant signal: Punch the main signal to assign!=Hauptsignal zuweisen: Bitte schlage das Hauptsignal! +Set influence point=Beeinflussungspunkt setzen +Apply=Anwenden +Route search: @1 found=Fahrstraßensuche: @1 gefunden +Search further=Weitersuchen +Smartroute: No track section directly ahead!=Fahrstraßensuche: Kein Gleisabschnitt voraus! +Smartroute: TCBS or routes don't exist here!=Fahrstraßensuche: Gleisabschnittsgrenze oder Fahrstraßen existieren hier nicht! + (invalid)=(ungültig) +@1 locks in state @2=@1 gesperrt in Position @2 +A route is requested from this signal:=Fahrstraße von diesem Signal: +Add locks=Sperre hinzu. +Assign a signal=Signal zuweisen +Automatic Working is active.=Automatischer Blockbetrieb aktiv. +Automatic routesetting=ARS (autom. Fahrstraßenauswahl) +Boundary TCBs:=Gleisabschnittsgrenzen: +Can't remove TCB: Both sides must have no signal assigned!=Kann Gleisabschnittsgrenze nicht entfernen: mindestens eine Seite hat noch ein Signal zugewiesen! +Can't remove track, a train is here!=Kann Gleisabschnittsgrenze nicht entfernen: hier ist noch ein Zug! +Cancel=Abbruch +Cancel Route=Fahrstraße auflösen +Cannot delete route which has ARS rules, please review and then delete through edit dialog!=Fahrstraße hat ARS-Regeln, bitte überprüfe diese und lösche die Fahrstraße über den Bearbeitungsdialog! +Clear locks=Sperren löschen +Configuring TCB: Already existed at this position, it is now linked to this TCB marker=Gleisabschnittsgrenze einstellen: Existierte hier bereits, der Marker ist nun verbunden +Configuring TCB: Cannot use static signals for routesetting. Aborted.=Gleisabschnittsgrenze einstellen: statische Signale können nicht für Fahrstraßen benutzt werden. Abbruch. +Configuring TCB: Internal error, TCBS doesn't exist. Aborted.=Gleisabschnittsgrenze einstellen: Interner Fehler, TCB existiert nicht. Abbruch. +Configuring TCB: Node is too far away. Aborted.=Gleisabschnittsgrenze einstellen: Block ist zu weit entfernt. Abbruch. +Configuring TCB: Not a compatible signal. Aborted.=Gleisabschnittsgrenze einstellen: Kein kompatibles Signal. Abbruch. +Configuring TCB: Please punch the rail you want to assign this TCB to.=Gleisabschnittsgrenze einstellen: Bitte das Gleis schlagen, wo die Grenze erstellt werden soll. +Configuring TCB: Please punch the signal to assign.=Gleisabschnittsgrenze einstellen: Bitte das zuzuweisende Signal schlagen. +Configuring TCB: Successfully assigned signal.=Gleisabschnittsgrenze einstellen: Signal erfolgreich zugewiesen. +Configuring TCB: Successfully configured TCB=Gleisabschnittsgrenze einstellen: Grenze erfolgreich erstellt +Configuring TCB: This is not a normal two-connection rail! Aborted.=Gleisabschnittsgrenze einstellen: Dies ist kein geeignetes Gleis! Abbruch. +Create Interlocked Track Section=Gleisabschnitt anlegen +Delete this route=Fahrstraße löschen +Disable Automatic Working=Auto. Blockbetrieb aus +Distant signal triggers ARS=Vorsignal kann ARS auslösen +Edit=Bearbeiten +Enable Automatic Working=Automatischer Blockbetrieb +Error: TS modified, abort!=Fehler: Abschnitt verändert, Abbruch! +Final TCBS unset (legacy-style buffer route)=Letzte Abschnittsgrenze fehlt (Prellbockroute aus älterer Version) +Fixed route locks (e.g. level crossings):=Feste Fahrstraßensperren (z.B. Bahnübergang): +Link @1=Verknüpfe @1 +Link: @1=Verknüpfung: @1 +Multiple routes are requested (first available is set):=Mehrere Fahrstraßen angefragt (erste verfügbare wird eingestellt): +NOTE: ARS is disabled.=ACHTUNG: ARS deaktiviert! +New (Manual)=Neu (Manuell) +No Link=Keine Verknüpfung +No routes are yet defined.=Bisher keine Fahrstraßen definiert. +No trains on this section.=Keine Züge auf diesem Abschnitt. +Punch components to add fixed locks. (punch anything else @= end)=Schlage auf Komponenten um diese zu sperren (schlage irgendetwas anderes @= Ende) +Remove Section=Gleisabschnitt löschen +Reset section state=Gleisabschnitt zurücksetzen +Reset track section=Gleisabschnitt zurücksetzen +Reset track section @1!=Streckenabschnitt @1 zurückgesetzt! +Route has been set.=Fahrstraße ist festgelegt. +Route is re-set when a train passed.=Fahrstraße wird nach Passieren eines Zuges nicht aufgelöst. +Route is set over this signal by:=Eine Fahrstraße ist über dieses Signal gestellt von: +Route is set: =Fahrstraße ist festgelegt: +Routes are not automatically set.=Fahrstraßen werden nicht automatisch gestellt. +Routes:=Fahrstraßen: +Section holds @1 route locks.=Abschnitt hält @1 Sperren. +Section name=Name des Streckenabschnitts +Set ARS default route=Setze als ARS-Standardroute +Set Route=Fahrstraße einstellen +Setting fixed locks finished!=Feste Fahrstraßensperren hinzugefügt! +Show=Anzeigen +Show track section=Gleisabschnitt anzeigen +Side @1=Seite @1 +Signal at @1=Signal bei @1 +Signal name=Signalname +Signal on B side already assigned!=Signal auf Seite B bereits zugewiesen! +Signalling=Fahrstraßen stellen +Smart Route=Fahrstraßensuche +TCB Link: Select linked TCB now!=Gleisabschnitte verknüpfen: Zu verknüpfende Gleisabschnittsgrenze jetzt auswählen! +TCB already existed at this position, now linked to this node=Gleisabschnittsgrenze existierte hier bereits, der Block ist nun verbunden +TCB assigned to @1=Gleisabschnittsgrenze an @1 zugewiesen +This TCB has been removed. Please dig marker.=Gleisabschnittsgrenze wurde gelöscht. Bitte Marker entfernen. +This is a pure distant signal@nNo route is currently set through.=Dies ist ein reines Vorsignal@nAktuell keine Fahrstraße eingestellt. +This is an always-halt signal (e.g. a buffer)@nNo routes can be set from here.=Dies ist ein Haltsignal (z.B. Prellbock)@nVon hier aus können keine Fahrstraßen eingestellt werden. +This will clear the list of trains@nand the routesetting status of this section.@nAre you sure?=Dies löscht die Liste der Züge im Abschnitt@nsowie den Fahrstraßenstatus.@nSind Sie sicher? +This will remove the track section and set all its end points to End Of Interlocking=Dies wird den Gleisabschnitt löschen +Track Circuit Break=Gleisabschnittsgrenze +Track Circuit Break Configuration=Einstellungen der Gleisabschnittsgrenze +Track Section Detail - @1=Gleisabschnitts-Details - @1 +Trains on this section:=Züge in diesem Abschnitt +Unconfigured Track Circuit Break, right-click to assign.=Nicht konfiguierte Gleisabschnittsgrenze (TCB). Rechtsklick zum Zuweisen. +Wait for this route to be cancelled in order to do anything here.=Erst nach Auflösung dieser Fahrstraße kann von hier gestellt werden. +Waiting for route to be set...=Warten, bis Fahrstraße verfügbar ist... +Yes=Ja +You cannot modify track sections when a route is set or a train is on the section.=Abschnitt kann nicht bearbeitet werden, wenn eine Fahrstraße gesetzt ist oder der Abschnitt belegt ist. +Emplace manual lock=Manuelle Sperre setzen +Interlocking tool@nPunch: Highlight track section@nPlace: check route locks/show track section info=Zugsicherungswerkzeug@nSchlagen: Gleisabschnitte hervorheben@nPlatzieren: Gleisabschnittsinformation/Fahrstraßensperren anzeigen +No route locks set=Keine Fahrstraßensperren gehalten +No track section at this location!=Kein Gleisabschnitt gefunden! +Node is not a track!=Block ist kein Gleis! +Route lock inspector=Fahrstraßensperren-Inspektor +Route locks currently put:=Gesetzte Fahrstraßensperren: +Point Speed Restriction Track=Geschwindigkeitskontrollgleis +Point speed restriction: @1=Geschwindigkeitskontrolle: @1 +Set point speed restriction:=Setze Kontrollgeschwindigkeit: +You are not allowed to configure this track without the @1 privilege.=Sie dürfen ohne das „@1“-Privileg dieses Gleis nicht konfigurieren. +You are not allowed to configure this track.=Sie dürfen dieses Gleis nicht konfigurieren.
\ No newline at end of file diff --git a/advtrains_interlocking/locale/advtrains_interlocking.fr.tr b/advtrains_interlocking/locale/advtrains_interlocking.fr.tr new file mode 100644 index 0000000..93bbaf2 --- /dev/null +++ b/advtrains_interlocking/locale/advtrains_interlocking.fr.tr @@ -0,0 +1,191 @@ +# textdomain: advtrains_interlocking +Prefix set, next signal name will be: @1= +Prefix unset, signals are not auto-named for you!= +Sets the current prefix for automatically naming interlocking components. Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on= +Created track section @1 from @2 TCBs= +Track section inconsistent here, repairing...= +Track section partition found, repairing...= +Can set up track sections, routes and signals= +@1 Terminal @2= +@1 is held in @2 position when this route is set and freed = +@1 is no longer affected when this route is set.= +Added track section @1 to the route.= +Advance to next route section= +Advance/Complete Route= +Advancing over next section is= +Cancel if you are unsure!= +Cancel route programming= +Cannot program route without a target= +End of interlocking= +Enter Route Name= +Finish programming route= +Finish route HERE= +Finish route at end of NEXT section= +Fixed in state @1 by route @2 (punch to unfix)= +Fixed in state @1 by route @2 until segment #@3 is freed.= +Insufficient privileges to use this!=Privilèges insuffisants pour utiliser ceci ! +Next section is diverging (>2 TCBs)= +#Route discarded.=Changement d'état de l'itinéraire. +Route ends at signal:= +Route leads into= +Route programming mode active. Punch TCBs to add route segments, punch turnouts to lock them.= +Route section @1 removed.= +Routes should in most cases end at signals.= +Save Route= +Step back one section= +#Successfully programmed route.=Succès d'invalidation des routages des trains +The origin TCB has become unknown during programming. Try again.= +This TCB is not suitable as= +This TCB is unconfigured, you first need to assign it to a rail= +WARNING: Route does not end at a signal.= +[Route programming] = +impossible at this place.= +non-interlocked area= +route continuation.= +<< Select a route part to edit options= +#<Default Aspect>=Siège par défaut +ARS Rule List= +#Announce distant signal=Signal distant métro de Munich ( +Back to signal= +Call-on (section may be occupied)= +Clone Route= +Delete Route= +Error:= +New From Route= +No Signal at this TCB= +Route name= +Route overview= +Save ARS List= +Section Options:= +Set= +#Signal Aspect:=Signal +TCB at @1 has different section than previous TCB= +TCB at @1 is missing= +TCB at @1 is not assigned to previous track section= +Track section after @1 missing= +Turnout/component missing at @1= +Lock conflict at @1, Held locked by:= +No TCB found at @1. Please update or reconfigure route!= +No track section adjacent to @1. Please reconfigure route!= +Route @1 from signal @2= +Route @1 from signal @2, segment #@3= +Section '@1' already has route set from @2:= +Section '@1' is occupied!= +Section '@1' not found!= +TCB at @1 has different section than previous TCB. Please update track section or reconfigure route!= +Turnout/component missing at @1. Please update track section or reconfigure route!= +<assign distant>= +<none>= +Assigned distant signal to the main signal at @1= +Assigned signal to the TCB at @1= +Clear= +Configuring Signal: Influence point of another signal is already present!= +Configuring Signal: Node is too far away. Aborted.= +Configuring Signal: Please look in train's driving direction and punch rail to set influence point.= +Configuring Signal: Successfully set influence point= +Configuring Signal: This is not a normal two-connection rail! Aborted.= +Dst: @1= +Influence point is not set.= +Influence point is set at @1.= +Modify= +Set distant signal: Punch the main signal to assign!= +Set influence point= +Apply= +Route search: @1 found= +Search further= +Smartroute: No track section directly ahead!= +Smartroute: TCBS or routes don't exist here!= + (invalid)= +@1 locks in state @2= +A route is requested from this signal:= +Add locks= +Assign a signal= +Automatic Working is active.= +#Automatic routesetting=Routage à distance +Boundary TCBs:= +Can't remove TCB: Both sides must have no signal assigned!= +Can't remove track, a train is here!= +Cancel= +Cancel Route= +Cannot delete route which has ARS rules, please review and then delete through edit dialog!= +#Clear locks=Autorisation (procédez) +Configuring TCB: Already existed at this position, it is now linked to this TCB marker= +Configuring TCB: Cannot use static signals for routesetting. Aborted.= +Configuring TCB: Internal error, TCBS doesn't exist. Aborted.= +Configuring TCB: Node is too far away. Aborted.= +Configuring TCB: Not a compatible signal. Aborted.= +Configuring TCB: Please punch the rail you want to assign this TCB to.= +Configuring TCB: Please punch the signal to assign.= +Configuring TCB: Successfully assigned signal.= +Configuring TCB: Successfully configured TCB= +Configuring TCB: This is not a normal two-connection rail! Aborted.= +Create Interlocked Track Section= +Delete this route= +Disable Automatic Working= +Distant signal triggers ARS= +Edit= +Enable Automatic Working= +Error: TS modified, abort!= +Final TCBS unset (legacy-style buffer route)= +Fixed route locks (e.g. level crossings):= +Link @1= +Link: @1= +Multiple routes are requested (first available is set):= +NOTE: ARS is disabled.= +New (Manual)= +No Link= +No routes are yet defined.= +No trains on this section.= +Punch components to add fixed locks. (punch anything else @= end)= +#Remove Section=Routage à distance +Reset section state= +#Reset track section=Inversion du sens de marche +Reset track section @1!= +Route has been set.= +Route is re-set when a train passed.= +Route is set over this signal by:= +Route is set: = +Routes are not automatically set.= +Routes:= +Section holds @1 route locks.= +#Section name=Nom de Station +Set ARS default route= +Set Route= +Setting fixed locks finished!= +Show= +Show track section= +Side @1= +#Signal at @1=Signal +#Signal name=Signal +Signal on B side already assigned!= +#Signalling=Signal +Smart Route= +TCB Link: Select linked TCB now!= +TCB already existed at this position, now linked to this node= +TCB assigned to @1= +This TCB has been removed. Please dig marker.= +This is a pure distant signal@nNo route is currently set through.= +This is an always-halt signal (e.g. a buffer)@nNo routes can be set from here.= +This will clear the list of trains@nand the routesetting status of this section.@nAre you sure?= +This will remove the track section and set all its end points to End Of Interlocking= +#Track Circuit Break=Il y a un "Track Circuit Break" ici. +#Track Circuit Break Configuration=Il y a un "Track Circuit Break" ici. +Track Section Detail - @1= +Trains on this section:= +Unconfigured Track Circuit Break, right-click to assign.= +Wait for this route to be cancelled in order to do anything here.= +Waiting for route to be set...= +Yes= +You cannot modify track sections when a route is set or a train is on the section.= +Emplace manual lock= +Interlocking tool@nPunch: Highlight track section@nPlace: check route locks/show track section info= +No route locks set= +No track section at this location!= +Node is not a track!= +Route lock inspector= +Route locks currently put:= +Point Speed Restriction Track=Voie de point de limitation de vitesse +Point speed restriction: @1=Point de limitation de vitesse : @1 +Set point speed restriction:=Placez un point de limitation de vitesse : +You are not allowed to configure this track without the @1 privilege.=Vous n'êtes pas autorisé à configurer cette voie sans le privilège @1. +You are not allowed to configure this track.=Vous n'êtes pas autorisé à configurer cette voie.
\ No newline at end of file diff --git a/advtrains_interlocking/locale/advtrains_interlocking.zh_CN.tr b/advtrains_interlocking/locale/advtrains_interlocking.zh_CN.tr new file mode 100644 index 0000000..701d283 --- /dev/null +++ b/advtrains_interlocking/locale/advtrains_interlocking.zh_CN.tr @@ -0,0 +1,191 @@ +# textdomain: advtrains_interlocking +Prefix set, next signal name will be: @1= +Prefix unset, signals are not auto-named for you!= +Sets the current prefix for automatically naming interlocking components. Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on= +Created track section @1 from @2 TCBs= +Track section inconsistent here, repairing...= +Track section partition found, repairing...= +Can set up track sections, routes and signals= +@1 Terminal @2= +@1 is held in @2 position when this route is set and freed = +@1 is no longer affected when this route is set.= +Added track section @1 to the route.= +Advance to next route section= +Advance/Complete Route= +Advancing over next section is= +Cancel if you are unsure!= +Cancel route programming= +Cannot program route without a target= +End of interlocking= +Enter Route Name= +Finish programming route= +Finish route HERE= +Finish route at end of NEXT section= +Fixed in state @1 by route @2 (punch to unfix)= +Fixed in state @1 by route @2 until segment #@3 is freed.= +Insufficient privileges to use this!= +Next section is diverging (>2 TCBs)= +Route discarded.= +Route ends at signal:= +Route leads into= +Route programming mode active. Punch TCBs to add route segments, punch turnouts to lock them.= +Route section @1 removed.= +Routes should in most cases end at signals.= +Save Route= +Step back one section= +Successfully programmed route.= +The origin TCB has become unknown during programming. Try again.= +This TCB is not suitable as= +This TCB is unconfigured, you first need to assign it to a rail= +WARNING: Route does not end at a signal.= +[Route programming] = +impossible at this place.= +non-interlocked area= +route continuation.= +<< Select a route part to edit options= +#<Default Aspect>=默认座位 +ARS Rule List= +Announce distant signal= +Back to signal= +Call-on (section may be occupied)= +Clone Route= +Delete Route= +Error:= +New From Route= +No Signal at this TCB= +Route name= +Route overview= +Save ARS List= +Section Options:= +Set= +#Signal Aspect:=信号灯 +TCB at @1 has different section than previous TCB= +TCB at @1 is missing= +TCB at @1 is not assigned to previous track section= +Track section after @1 missing= +Turnout/component missing at @1= +Lock conflict at @1, Held locked by:= +No TCB found at @1. Please update or reconfigure route!= +No track section adjacent to @1. Please reconfigure route!= +Route @1 from signal @2= +Route @1 from signal @2, segment #@3= +Section '@1' already has route set from @2:= +Section '@1' is occupied!= +Section '@1' not found!= +TCB at @1 has different section than previous TCB. Please update track section or reconfigure route!= +Turnout/component missing at @1. Please update track section or reconfigure route!= +<assign distant>= +<none>= +Assigned distant signal to the main signal at @1= +Assigned signal to the TCB at @1= +Clear= +Configuring Signal: Influence point of another signal is already present!= +Configuring Signal: Node is too far away. Aborted.= +Configuring Signal: Please look in train's driving direction and punch rail to set influence point.= +Configuring Signal: Successfully set influence point= +Configuring Signal: This is not a normal two-connection rail! Aborted.= +Dst: @1= +Influence point is not set.= +Influence point is set at @1.= +Modify= +Set distant signal: Punch the main signal to assign!= +Set influence point= +Apply= +Route search: @1 found= +Search further= +Smartroute: No track section directly ahead!= +Smartroute: TCBS or routes don't exist here!= + (invalid)= +@1 locks in state @2= +A route is requested from this signal:= +Add locks= +Assign a signal= +Automatic Working is active.= +Automatic routesetting= +Boundary TCBs:= +Can't remove TCB: Both sides must have no signal assigned!= +Can't remove track, a train is here!= +Cancel= +Cancel Route= +Cannot delete route which has ARS rules, please review and then delete through edit dialog!= +Clear locks= +Configuring TCB: Already existed at this position, it is now linked to this TCB marker= +Configuring TCB: Cannot use static signals for routesetting. Aborted.= +Configuring TCB: Internal error, TCBS doesn't exist. Aborted.= +Configuring TCB: Node is too far away. Aborted.= +Configuring TCB: Not a compatible signal. Aborted.= +Configuring TCB: Please punch the rail you want to assign this TCB to.= +Configuring TCB: Please punch the signal to assign.= +Configuring TCB: Successfully assigned signal.= +Configuring TCB: Successfully configured TCB= +Configuring TCB: This is not a normal two-connection rail! Aborted.= +Create Interlocked Track Section= +Delete this route= +Disable Automatic Working= +Distant signal triggers ARS= +Edit= +Enable Automatic Working= +Error: TS modified, abort!= +Final TCBS unset (legacy-style buffer route)= +Fixed route locks (e.g. level crossings):= +Link @1= +Link: @1= +Multiple routes are requested (first available is set):= +NOTE: ARS is disabled.= +New (Manual)= +No Link= +No routes are yet defined.= +No trains on this section.= +Punch components to add fixed locks. (punch anything else @= end)= +Remove Section= +Reset section state= +#Reset track section=改变行车方向 +Reset track section @1!= +Route has been set.= +Route is re-set when a train passed.= +Route is set over this signal by:= +Route is set: = +Routes are not automatically set.= +Routes:= +Section holds @1 route locks.= +#Section name=车站名称 +Set ARS default route= +Set Route= +Setting fixed locks finished!= +Show= +Show track section= +Side @1= +#Signal at @1=信号灯 +#Signal name=信号灯 +Signal on B side already assigned!= +#Signalling=信号灯 +Smart Route= +TCB Link: Select linked TCB now!= +TCB already existed at this position, now linked to this node= +TCB assigned to @1= +This TCB has been removed. Please dig marker.= +This is a pure distant signal@nNo route is currently set through.= +This is an always-halt signal (e.g. a buffer)@nNo routes can be set from here.= +This will clear the list of trains@nand the routesetting status of this section.@nAre you sure?= +This will remove the track section and set all its end points to End Of Interlocking= +Track Circuit Break= +Track Circuit Break Configuration= +Track Section Detail - @1= +Trains on this section:= +Unconfigured Track Circuit Break, right-click to assign.= +Wait for this route to be cancelled in order to do anything here.= +Waiting for route to be set...= +Yes= +You cannot modify track sections when a route is set or a train is on the section.= +Emplace manual lock= +Interlocking tool@nPunch: Highlight track section@nPlace: check route locks/show track section info= +No route locks set= +No track section at this location!= +Node is not a track!= +Route lock inspector= +Route locks currently put:= +Point Speed Restriction Track= +Point speed restriction: @1= +Set point speed restriction:= +You are not allowed to configure this track without the @1 privilege.=您没有“@1”权限，不能调整这段轨道。 +You are not allowed to configure this track.=您不能调整这段轨道。
\ No newline at end of file diff --git a/advtrains_interlocking/locale/advtrains_interlocking.zh_TW.tr b/advtrains_interlocking/locale/advtrains_interlocking.zh_TW.tr new file mode 100644 index 0000000..64e1626 --- /dev/null +++ b/advtrains_interlocking/locale/advtrains_interlocking.zh_TW.tr @@ -0,0 +1,191 @@ +# textdomain: advtrains_interlocking +Prefix set, next signal name will be: @1= +Prefix unset, signals are not auto-named for you!= +Sets the current prefix for automatically naming interlocking components. Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on= +Created track section @1 from @2 TCBs= +Track section inconsistent here, repairing...= +Track section partition found, repairing...= +Can set up track sections, routes and signals= +@1 Terminal @2= +@1 is held in @2 position when this route is set and freed = +@1 is no longer affected when this route is set.= +Added track section @1 to the route.= +Advance to next route section= +Advance/Complete Route= +Advancing over next section is= +Cancel if you are unsure!= +Cancel route programming= +Cannot program route without a target= +End of interlocking= +Enter Route Name= +Finish programming route= +Finish route HERE= +Finish route at end of NEXT section= +Fixed in state @1 by route @2 (punch to unfix)= +Fixed in state @1 by route @2 until segment #@3 is freed.= +Insufficient privileges to use this!= +Next section is diverging (>2 TCBs)= +Route discarded.= +Route ends at signal:= +Route leads into= +Route programming mode active. Punch TCBs to add route segments, punch turnouts to lock them.= +Route section @1 removed.= +Routes should in most cases end at signals.= +Save Route= +Step back one section= +Successfully programmed route.= +The origin TCB has become unknown during programming. Try again.= +This TCB is not suitable as= +This TCB is unconfigured, you first need to assign it to a rail= +WARNING: Route does not end at a signal.= +[Route programming] = +impossible at this place.= +non-interlocked area= +route continuation.= +<< Select a route part to edit options= +#<Default Aspect>=預設座位 +ARS Rule List= +Announce distant signal= +Back to signal= +Call-on (section may be occupied)= +Clone Route= +Delete Route= +Error:= +New From Route= +No Signal at this TCB= +Route name= +Route overview= +Save ARS List= +Section Options:= +Set= +#Signal Aspect:=色燈號誌機 +TCB at @1 has different section than previous TCB= +TCB at @1 is missing= +TCB at @1 is not assigned to previous track section= +Track section after @1 missing= +Turnout/component missing at @1= +Lock conflict at @1, Held locked by:= +No TCB found at @1. Please update or reconfigure route!= +No track section adjacent to @1. Please reconfigure route!= +Route @1 from signal @2= +Route @1 from signal @2, segment #@3= +Section '@1' already has route set from @2:= +Section '@1' is occupied!= +Section '@1' not found!= +TCB at @1 has different section than previous TCB. Please update track section or reconfigure route!= +Turnout/component missing at @1. Please update track section or reconfigure route!= +<assign distant>= +<none>= +Assigned distant signal to the main signal at @1= +Assigned signal to the TCB at @1= +Clear= +Configuring Signal: Influence point of another signal is already present!= +Configuring Signal: Node is too far away. Aborted.= +Configuring Signal: Please look in train's driving direction and punch rail to set influence point.= +Configuring Signal: Successfully set influence point= +Configuring Signal: This is not a normal two-connection rail! Aborted.= +Dst: @1= +Influence point is not set.= +Influence point is set at @1.= +Modify= +Set distant signal: Punch the main signal to assign!= +Set influence point= +Apply= +Route search: @1 found= +Search further= +Smartroute: No track section directly ahead!= +Smartroute: TCBS or routes don't exist here!= + (invalid)= +@1 locks in state @2= +A route is requested from this signal:= +Add locks= +Assign a signal= +Automatic Working is active.= +Automatic routesetting= +Boundary TCBs:= +Can't remove TCB: Both sides must have no signal assigned!= +Can't remove track, a train is here!= +Cancel= +Cancel Route= +Cannot delete route which has ARS rules, please review and then delete through edit dialog!= +Clear locks= +Configuring TCB: Already existed at this position, it is now linked to this TCB marker= +Configuring TCB: Cannot use static signals for routesetting. Aborted.= +Configuring TCB: Internal error, TCBS doesn't exist. Aborted.= +Configuring TCB: Node is too far away. Aborted.= +Configuring TCB: Not a compatible signal. Aborted.= +Configuring TCB: Please punch the rail you want to assign this TCB to.= +Configuring TCB: Please punch the signal to assign.= +Configuring TCB: Successfully assigned signal.= +Configuring TCB: Successfully configured TCB= +Configuring TCB: This is not a normal two-connection rail! Aborted.= +Create Interlocked Track Section= +Delete this route= +Disable Automatic Working= +Distant signal triggers ARS= +Edit= +Enable Automatic Working= +Error: TS modified, abort!= +Final TCBS unset (legacy-style buffer route)= +Fixed route locks (e.g. level crossings):= +Link @1= +Link: @1= +Multiple routes are requested (first available is set):= +NOTE: ARS is disabled.= +New (Manual)= +No Link= +No routes are yet defined.= +No trains on this section.= +Punch components to add fixed locks. (punch anything else @= end)= +Remove Section= +Reset section state= +#Reset track section=改變行車方向 +Reset track section @1!= +Route has been set.= +Route is re-set when a train passed.= +Route is set over this signal by:= +Route is set: = +Routes are not automatically set.= +Routes:= +Section holds @1 route locks.= +#Section name=車站名稱 +Set ARS default route= +Set Route= +Setting fixed locks finished!= +Show= +Show track section= +Side @1= +#Signal at @1=色燈號誌機 +#Signal name=色燈號誌機 +Signal on B side already assigned!= +#Signalling=色燈號誌機 +Smart Route= +TCB Link: Select linked TCB now!= +TCB already existed at this position, now linked to this node= +TCB assigned to @1= +This TCB has been removed. Please dig marker.= +This is a pure distant signal@nNo route is currently set through.= +This is an always-halt signal (e.g. a buffer)@nNo routes can be set from here.= +This will clear the list of trains@nand the routesetting status of this section.@nAre you sure?= +This will remove the track section and set all its end points to End Of Interlocking= +Track Circuit Break= +Track Circuit Break Configuration= +Track Section Detail - @1= +Trains on this section:= +Unconfigured Track Circuit Break, right-click to assign.= +Wait for this route to be cancelled in order to do anything here.= +Waiting for route to be set...= +Yes= +You cannot modify track sections when a route is set or a train is on the section.= +Emplace manual lock= +Interlocking tool@nPunch: Highlight track section@nPlace: check route locks/show track section info= +No route locks set= +No track section at this location!= +Node is not a track!= +Route lock inspector= +Route locks currently put:= +Point Speed Restriction Track= +Point speed restriction: @1= +Set point speed restriction:= +You are not allowed to configure this track without the @1 privilege.=您沒有「@1」許可權，不能調整這段軌道。 +You are not allowed to configure this track.=您不能調整這段軌道。
\ No newline at end of file diff --git a/advtrains_interlocking/mod.conf b/advtrains_interlocking/mod.conf index 3b2d029..9191dd9 100644 --- a/advtrains_interlocking/mod.conf +++ b/advtrains_interlocking/mod.conf @@ -4,4 +4,4 @@ description=Interlocking system for Advanced Trains author=orwell96 depends=advtrains -optional_depends=advtrains_train_track +#optional_depends=advtrains_train_track diff --git a/advtrains_interlocking/po/README.md b/advtrains_interlocking/po/README.md new file mode 100644 index 0000000..3e94682 --- /dev/null +++ b/advtrains_interlocking/po/README.md @@ -0,0 +1,70 @@ +# Translations +Please read this document before working on any translations. + +Unlike many other mods, Advtrains uses `.po` files for localization, +which are then automatically converted to `.tr` files when the mod is +loaded. Therefore, please submit patches that edit the `.po` files. + +## Getting Started +The translation files can be edited like any other `.po` file. + +If the translation file for your language does not exist, create it by +copying `template.txt` to `advtrains.XX.tr`, where `XX` is replaced by +the language code. + +Feel free to use the [discussion mailing list][srht-discuss] if you +have any questions regarding localization. + +You can share your `.po` file directly or [as a patch][gsm] to the [dev +mailing list][srht-devel]. The latter is encouraged, but, unlike code +changes, translation files sent directly are also accepted. + +[tr-format]: https://minetest.gitlab.io/minetest/translations/#translation-file-format +[srht-discuss]: https://lists.sr.ht/~gpcf/advtrains-discuss +[srht-devel]: https://lists.sr.ht/~gpcf/advtrains-devel +[gsm]: https://git-send-email.io + +## Translation Notes +* Translations should be consistent. You can use other entries or the +translations in Minetest as a reference. +* Translations do not have to fully correspond to the original text - +they only need to provide the same information. In particular, +translations do not need to have the same linguistical structure as the +original text. +* Replacement sequences (`@1`, `@2`, etc) should not be translated. +* Certain abbreviations or names, such as "Ks" or "Zs 3", should +generally not be translated. + +### (de) German +* Verwenden Sie die neue Rechtschreibung und die Sie-Form. +* Mit der deutschen Tastaturbelegung unter Linux können die +Anführungszeichen „“ mit AltGr-V bzw. AltGr-B eingegeben werden. + +### (zh) Chinese +(This section is written in English to avoid writing the note twice or +using only one of the variants, as most of this section applies to both +the traditional and simplified variants.) + +* Please use the 「」 quotation marks for Traditional Chinese and “” +for Simplified Chinese. +* Please use the fullwidth variants of: ， 、 。 ？ ！ ： ； +* Please use the halfwidth variants of: ( ) [ ] / \ | +* Please do not leave any space between Han characters (including +fullwidth punctuation marks). +* Please leave a space between Han characters (excluding fullwidth +punctuation marks) and characters from other scripts (including +halfwidth punctuation marks). However, do not leave any space between +Han characters and Arabic numerals. + +## Notes for developers +* The `update-translations.sh` script can be used to update the +translation files. However, please make sure to install the +`basic_trains` mod before running the script. +* Please make sure that the first argument to `S` (or `attrans`) _only_ +includes string literals without formatting or concatenation. This is +unfortunately a limitation of the `xgettext` utility. +* Avoid word-by-word translations. +* Avoid manipulating translated strings (except for concatenation). Use +server-side translations if you have to modify the text sent to users. +* Avoid truncating strings unless multibyte characters are handled +properly. diff --git a/advtrains_interlocking/po/advtrains_interlocking.pot b/advtrains_interlocking/po/advtrains_interlocking.pot new file mode 100644 index 0000000..312a843 --- /dev/null +++ b/advtrains_interlocking/po/advtrains_interlocking.pot @@ -0,0 +1,807 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the advtrains_interlocking package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: advtrains_interlocking\n" +"Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n" +"POT-Creation-Date: 2025-06-11 23:21+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: autonaming.lua +msgid "Prefix set, next signal name will be: @1" +msgstr "" + +#: autonaming.lua +msgid "Prefix unset, signals are not auto-named for you!" +msgstr "" + +#: autonaming.lua +msgid "" +"Sets the current prefix for automatically naming interlocking components. " +"Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on" +msgstr "" + +#: database.lua +msgid "Track section inconsistent here, repairing..." +msgstr "" + +#: database.lua +msgid "Track section partition found, repairing..." +msgstr "" + +#: database.lua +msgid "Created track section @1 from @2 TCBs" +msgstr "" + +#: init.lua +msgid "Can set up track sections, routes and signals" +msgstr "" + +#: route_prog.lua +msgid "[Route programming] " +msgstr "" + +#: route_prog.lua +msgid "@1 is no longer affected when this route is set." +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 until segment #@3 is freed." +msgstr "" + +#: route_prog.lua +msgid "@1 Terminal @2" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 (punch to unfix)" +msgstr "" + +#: route_prog.lua route_ui.lua signal_aspect_ui.lua tcb_ts_ui.lua tool.lua +msgid "Insufficient privileges to use this!" +msgstr "" + +#: route_prog.lua +msgid "" +"Route programming mode active. Punch TCBs to add route segments, punch " +"turnouts to lock them." +msgstr "" + +#: route_prog.lua +msgid "Added track section @1 to the route." +msgstr "" + +#: route_prog.lua +msgid "Finish programming route" +msgstr "" + +#: route_prog.lua +msgid "Route ends at signal:" +msgstr "" + +#: route_prog.lua +msgid "WARNING: Route does not end at a signal." +msgstr "" + +#: route_prog.lua +msgid "Routes should in most cases end at signals." +msgstr "" + +#: route_prog.lua +msgid "Cancel if you are unsure!" +msgstr "" + +#: route_prog.lua +msgid "Route leads into" +msgstr "" + +#: route_prog.lua +msgid "non-interlocked area" +msgstr "" + +#: route_prog.lua +msgid "Enter Route Name" +msgstr "" + +#: route_prog.lua +msgid "Save Route" +msgstr "" + +#: route_prog.lua +msgid "Next section is diverging (>2 TCBs)" +msgstr "" + +#: route_prog.lua tcb_ts_ui.lua +msgid "End of interlocking" +msgstr "" + +#: route_prog.lua +msgid "Advance/Complete Route" +msgstr "" + +#: route_prog.lua +msgid "Advance to next route section" +msgstr "" + +#: route_prog.lua +msgid "This TCB is not suitable as" +msgstr "" + +#: route_prog.lua +msgid "route continuation." +msgstr "" + +#: route_prog.lua +msgid "Finish route HERE" +msgstr "" + +#: route_prog.lua +msgid "Finish route at end of NEXT section" +msgstr "" + +#: route_prog.lua +msgid "Advancing over next section is" +msgstr "" + +#: route_prog.lua +msgid "impossible at this place." +msgstr "" + +#: route_prog.lua +msgid "Step back one section" +msgstr "" + +#: route_prog.lua +msgid "Cancel route programming" +msgstr "" + +#: route_prog.lua +msgid "Route section @1 removed." +msgstr "" + +#: route_prog.lua +msgid "Route discarded." +msgstr "" + +#: route_prog.lua +msgid "Cannot program route without a target" +msgstr "" + +#: route_prog.lua +msgid "The origin TCB has become unknown during programming. Try again." +msgstr "" + +#: route_prog.lua +msgid "Successfully programmed route." +msgstr "" + +#: route_prog.lua +msgid "This TCB is unconfigured, you first need to assign it to a rail" +msgstr "" + +#: route_prog.lua +msgid "@1 is held in @2 position when this route is set and freed " +msgstr "" + +#: route_ui.lua +msgid "Route overview" +msgstr "" + +#: route_ui.lua +msgid "Route name" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Set" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Track section after @1 missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Turnout/component missing at @1" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is not assigned to previous track section" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 has different section than previous TCB" +msgstr "" + +#: route_ui.lua signal_aspect_ui.lua +msgid "Signal Aspect:" +msgstr "" + +#: route_ui.lua +msgid "<Default Aspect>" +msgstr "" + +#: route_ui.lua +msgid "Announce distant signal" +msgstr "" + +#: route_ui.lua +msgid "No Signal at this TCB" +msgstr "" + +#: route_ui.lua +msgid "Section Options:" +msgstr "" + +#: route_ui.lua +msgid "Call-on (section may be occupied)" +msgstr "" + +#: route_ui.lua +msgid "Error:" +msgstr "" + +#: route_ui.lua +msgid "<< Select a route part to edit options" +msgstr "" + +#: route_ui.lua +msgid "Delete Route" +msgstr "" + +#: route_ui.lua +msgid "Back to signal" +msgstr "" + +#: route_ui.lua +msgid "Clone Route" +msgstr "" + +#: route_ui.lua +msgid "New From Route" +msgstr "" + +#: route_ui.lua +msgid "ARS Rule List" +msgstr "" + +#: route_ui.lua +msgid "Save ARS List" +msgstr "" + +#: routesetting.lua +msgid "No TCB found at @1. Please update or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "No track section adjacent to @1. Please reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' not found!" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' already has route set from @2:" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' is occupied!" +msgstr "" + +#: routesetting.lua +msgid "Lock conflict at @1, Held locked by:" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2" +msgstr "" + +#: routesetting.lua +msgid "" +"Turnout/component missing at @1. Please update track section or reconfigure " +"route!" +msgstr "" + +#: routesetting.lua +msgid "" +"TCB at @1 has different section than previous TCB. Please update track " +"section or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2, segment #@3" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is set at @1." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Modify" +msgstr "" + +#: signal_aspect_ui.lua tool.lua +msgid "Clear" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is not set." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set influence point" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<none>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Dst: @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<assign distant>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Please look in train's driving direction and punch rail " +"to set influence point." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set distant signal: Punch the main signal to assign!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned signal to the TCB at @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned distant signal to the main signal at @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Successfully set influence point" +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Influence point of another signal is already present!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Node is too far away. Aborted." +msgstr "" + +#: smartroute.lua +msgid "Smartroute: TCBS or routes don't exist here!" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: No track section directly ahead!" +msgstr "" + +#: smartroute.lua +msgid "Route search: @1 found" +msgstr "" + +#: smartroute.lua +msgid "Search further" +msgstr "" + +#: smartroute.lua +msgid "Apply" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Unconfigured Track Circuit Break, right-click to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "This TCB has been removed. Please dig marker." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the rail you want to assign this TCB to." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove TCB: Both sides must have no signal assigned!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Configuring TCB: Already existed at this position, it is now linked to this " +"TCB marker" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB assigned to @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully configured TCB" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Node is too far away. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully assigned signal." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Internal error, TCBS doesn't exist. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Cannot use static signals for routesetting. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Not a compatible signal. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "@1 locks in state @2" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Error: TS modified, abort!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Setting fixed locks finished!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB already existed at this position, now linked to this node" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Signal on B side already assigned!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove track, a train is here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Side @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show track section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Create Interlocked Track Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link: @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No Link" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Signalling" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Assign a signal" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break Configuration" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB Link: Select linked TCB now!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the signal to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Section Detail - @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Section name" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Boundary TCBs:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Fixed route locks (e.g. level crossings):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Add locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Clear locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Remove Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will remove the track section and set all its end points to End Of " +"Interlocking" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set: " +msgstr "" + +#: tcb_ts_ui.lua +msgid "Section holds @1 route locks." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Trains on this section:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No trains on this section." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Reset section state" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"You cannot modify track sections when a route is set or a train is on the " +"section." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Punch components to add fixed locks. (punch anything else = end)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Reset track section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will clear the list of trains\n" +"and the routesetting status of this section.\n" +"Are you sure?" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Yes" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Reset track section @1!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Final TCBS unset (legacy-style buffer route)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Signal at @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Signal name" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Multiple routes are requested (first available is set):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "A route is requested from this signal:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route has been set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Waiting for route to be set..." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Enable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic Working is active." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is re-set when a train passed." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Disable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid " (invalid)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Set Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Set ARS default route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Edit" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Delete this route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "NOTE: ARS is disabled." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes are not automatically set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Smart Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "New (Manual)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic routesetting" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Distant signal triggers ARS" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No routes are yet defined." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is an always-halt signal (e.g. a buffer)\n" +"No routes can be set from here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is a pure distant signal\n" +"No route is currently set through." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set over this signal by:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Wait for this route to be cancelled in order to do anything here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Cannot delete route which has ARS rules, please review and then delete " +"through edit dialog!" +msgstr "" + +#: tool.lua +msgid "Route lock inspector" +msgstr "" + +#: tool.lua +msgid "Route locks currently put:" +msgstr "" + +#: tool.lua +msgid "No route locks set" +msgstr "" + +#: tool.lua +msgid "Emplace manual lock" +msgstr "" + +#: tool.lua +msgid "Node is not a track!" +msgstr "" + +#: tool.lua +msgid "No track section at this location!" +msgstr "" + +#: tool.lua +msgid "" +"Interlocking tool\n" +"Punch: Highlight track section\n" +"Place: check route locks/show track section info" +msgstr "" + +#: tsr_rail.lua +msgid "Point speed restriction: @1" +msgstr "" + +#: tsr_rail.lua +msgid "Set point speed restriction:" +msgstr "" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track without the @1 privilege." +msgstr "" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track." +msgstr "" + +#: tsr_rail.lua +msgid "Point Speed Restriction Track" +msgstr "" diff --git a/advtrains_interlocking/po/de.po b/advtrains_interlocking/po/de.po new file mode 100644 index 0000000..d3aa1dc --- /dev/null +++ b/advtrains_interlocking/po/de.po @@ -0,0 +1,1378 @@ +msgid "" +msgstr "" +"Project-Id-Version: advtrains\n" +"Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n" +"POT-Creation-Date: 2025-06-11 23:21+0200\n" +"PO-Revision-Date: 2025-06-12 22:55+0200\n" +"Last-Translator: Y. Wang <yw05@forksworld.de>\n" +"Language-Team: German\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.2.2\n" + +#: autonaming.lua +msgid "Prefix set, next signal name will be: @1" +msgstr "Präfix gesetzt, nächster Signalname: @1" + +#: autonaming.lua +msgid "Prefix unset, signals are not auto-named for you!" +msgstr "Präfix gelöscht, automatische Signalbenennung deaktiviert!" + +#: autonaming.lua +msgid "" +"Sets the current prefix for automatically naming interlocking components. " +"Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on" +msgstr "" +"Setze einen Präfix für die automatische Benennung von neu hinzugefügten " +"Signalen. Beispiel: '/at_nameprefix TEST' - Signale werden mit TEST1, TEST2 " +"usw. benannt" + +#: database.lua +msgid "Created track section @1 from @2 TCBs" +msgstr "Gleisabschnitt @1 aus @2 TCBs erstellt" + +#: database.lua +msgid "Track section inconsistent here, repairing..." +msgstr "Gleisabschnitt ist inkonsistent, repariere..." + +#: database.lua +msgid "Track section partition found, repairing..." +msgstr "Gleisabschnitt partitioniert, repariere..." + +#: init.lua +msgid "Can set up track sections, routes and signals" +msgstr "Darf Gleisabschnitte, Fahrstraßen und Signale bearbeiten" + +#: route_prog.lua +msgid "@1 Terminal @2" +msgstr "@1 Ziel @2" + +#: route_prog.lua +msgid "@1 is held in @2 position when this route is set and freed " +msgstr "@1 wird durch die Fahrstraße in Position @2 festgelegt" + +#: route_prog.lua +msgid "@1 is no longer affected when this route is set." +msgstr "@1 wird nicht mehr durch die Fahrstraße festgelegt" + +#: route_prog.lua +msgid "Added track section @1 to the route." +msgstr "Gleisabschnitt @1 zur Fahrstraße hinzugefügt." + +#: route_prog.lua +msgid "Advance to next route section" +msgstr "Nächsten Gleisabschnitt hinzufügen" + +#: route_prog.lua +msgid "Advance/Complete Route" +msgstr "Fahrstraße fortsetzen/beenden" + +#: route_prog.lua +msgid "Advancing over next section is" +msgstr "Fortsetzen über nächsten Gleisabschnitt hinaus" + +#: route_prog.lua +msgid "Cancel if you are unsure!" +msgstr "Abbrechen, wenn Sie unsicher sind!" + +#: route_prog.lua +msgid "Cancel route programming" +msgstr "Fahrstraßenprogrammierung abbrechen" + +#: route_prog.lua +msgid "Cannot program route without a target" +msgstr "Kann keine Fahrstraße ohne Ziel programmieren" + +#: route_prog.lua tcb_ts_ui.lua +msgid "End of interlocking" +msgstr "Ende der Zugsicherung" + +#: route_prog.lua +msgid "Enter Route Name" +msgstr "Fahrstraßennamen eingeben" + +#: route_prog.lua +msgid "Finish programming route" +msgstr "Fahrstraße abschließen" + +#: route_prog.lua +msgid "Finish route HERE" +msgstr "Fahrstraße HIER abschließen" + +#: route_prog.lua +msgid "Finish route at end of NEXT section" +msgstr "Fahrstraße am Ende des NÄCHSTEN Abschnitts abschließen" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 (punch to unfix)" +msgstr "Festgelegt in Zustand @1 durch Fahrstraße @2 (Schlagen um freizugeben)" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 until segment #@3 is freed." +msgstr "" +"Festgelegt in Zustand @1 durch Fahrstraße @2, bis Segment @3 freigegeben " +"wird." + +#: route_prog.lua route_ui.lua signal_aspect_ui.lua tcb_ts_ui.lua tool.lua +msgid "Insufficient privileges to use this!" +msgstr "Unzureichende Privilegien, um dies zu benutzen!" + +#: route_prog.lua +msgid "Next section is diverging (>2 TCBs)" +msgstr "Nächster Abschnitt enthält eine Weiche (>2 TCBs)" + +#: route_prog.lua +msgid "Route discarded." +msgstr "Fahrstraße verworfen." + +#: route_prog.lua +msgid "Route ends at signal:" +msgstr "Fahrstraße endet bei Signal:" + +#: route_prog.lua +msgid "Route leads into" +msgstr "Fahrstraße führt in" + +#: route_prog.lua +msgid "" +"Route programming mode active. Punch TCBs to add route segments, punch " +"turnouts to lock them." +msgstr "" +"Fahrstraßenprogrammierung aktiv. Schlage Gleisabschnittsgrenzen (TCB) um " +"Segmente hinzuzufügen, schlage Weichen um sie festzulegen." + +#: route_prog.lua +msgid "Route section @1 removed." +msgstr "Fahrstraßenabschnitt @1 entfernt." + +#: route_prog.lua +msgid "Routes should in most cases end at signals." +msgstr "Fahrstraßen sollten normalerweise an einem Signal enden." + +#: route_prog.lua +msgid "Save Route" +msgstr "Fahrstraße speichern" + +#: route_prog.lua +msgid "Step back one section" +msgstr "Einen Abschnitt zurück" + +#: route_prog.lua +msgid "Successfully programmed route." +msgstr "Fahrstraße erfolgreich programmiert." + +#: route_prog.lua +msgid "The origin TCB has become unknown during programming. Try again." +msgstr "Der Start-TCB ist unbekannt geworden. Versuche nochmal." + +#: route_prog.lua +msgid "This TCB is not suitable as" +msgstr "Diese Gleisabschnittsgrenze ist" + +#: route_prog.lua +msgid "This TCB is unconfigured, you first need to assign it to a rail" +msgstr "" +"Diese Gleisabschnittsgrenze ist noch nicht konfiguiert, sie muss erst " +"zugewiesen werden" + +#: route_prog.lua +msgid "WARNING: Route does not end at a signal." +msgstr "ACHTUNG: Fahrstraße endet nicht an einem Signal." + +#: route_prog.lua +msgid "[Route programming] " +msgstr "[Fahrstraßenprogrammierung] " + +#: route_prog.lua +msgid "impossible at this place." +msgstr "ist hier nicht möglich." + +#: route_prog.lua +msgid "non-interlocked area" +msgstr "nicht-überwachtes Gebiet" + +#: route_prog.lua +msgid "route continuation." +msgstr "nicht als Fortsetzung geeignet." + +#: route_ui.lua +msgid "<< Select a route part to edit options" +msgstr "<< Wähle einen Abschnitt, um Optionen zu bearbeiten" + +#: route_ui.lua +msgid "<Default Aspect>" +msgstr "<Standardbegriff>" + +#: route_ui.lua +msgid "ARS Rule List" +msgstr "ARS-Regelliste" + +#: route_ui.lua +msgid "Announce distant signal" +msgstr "Entferntes Hauptsignal ankündigen" + +#: route_ui.lua +msgid "Back to signal" +msgstr "Zurück zum Signal" + +#: route_ui.lua +msgid "Call-on (section may be occupied)" +msgstr "Abschnitt darf belegt sein" + +#: route_ui.lua +msgid "Clone Route" +msgstr "Duplizieren" + +#: route_ui.lua +msgid "Delete Route" +msgstr "Fahrstraße löschen" + +#: route_ui.lua +msgid "Error:" +msgstr "Fehler:" + +#: route_ui.lua +msgid "New From Route" +msgstr "Neu aus dieser FS" + +#: route_ui.lua +msgid "No Signal at this TCB" +msgstr "Kein Signal hier" + +#: route_ui.lua +msgid "Route name" +msgstr "Fahrstraßenname" + +#: route_ui.lua +msgid "Route overview" +msgstr "Fahrstraßenübersicht" + +#: route_ui.lua +msgid "Save ARS List" +msgstr "ARS-Liste speichern" + +#: route_ui.lua +msgid "Section Options:" +msgstr "Abschnittsoptionen:" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Set" +msgstr "Setzen" + +#: route_ui.lua signal_aspect_ui.lua +msgid "Signal Aspect:" +msgstr "Signalbegriff:" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 has different section than previous TCB" +msgstr "TCB bei @1 hat einen anderen Gleisabschnitt als der vorherige TCB" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is missing" +msgstr "TCB bei @1 fehlt" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is not assigned to previous track section" +msgstr "TCB bei @1 ist dem vorherigen Gleisabschnitt nicht zugewiesen" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Track section after @1 missing" +msgstr "Gleisabschnitt nach @1 fehlt" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Turnout/component missing at @1" +msgstr "Weiche oder Komponente bei @1 fehlt" + +#: routesetting.lua +msgid "Lock conflict at @1, Held locked by:" +msgstr "Sperrenkonflikt bei @1, bereits gesperrt durch:" + +#: routesetting.lua +msgid "No TCB found at @1. Please update or reconfigure route!" +msgstr "TCB bei @1 nicht gefunden. Bitte Fahrstraße korrigieren!" + +#: routesetting.lua +msgid "No track section adjacent to @1. Please reconfigure route!" +msgstr "Gleisabschnitt nach @1 nicht gefunden. Bitte Fahrstraße korrigieren!" + +#: routesetting.lua +msgid "Route @1 from signal @2" +msgstr "Fahrstraße @1 von Signal @2" + +#: routesetting.lua +msgid "Route @1 from signal @2, segment #@3" +msgstr "Fahrstraße @1 von Signal @2, Segment @3" + +#: routesetting.lua +msgid "Section '@1' already has route set from @2:" +msgstr "Abschnitt '@1' bereits durch Fahrstraße von @2 belegt:" + +#: routesetting.lua +msgid "Section '@1' is occupied!" +msgstr "Abschnitt '@1' ist durch einen Zug belegt!" + +#: routesetting.lua +msgid "Section '@1' not found!" +msgstr "Abschnitt '@1' nicht gefunden!" + +#: routesetting.lua +msgid "" +"TCB at @1 has different section than previous TCB. Please update track " +"section or reconfigure route!" +msgstr "" +"TCB bei @1 hat anderen Abschnitt als vorhergehender TCB. Bitte Fahrstraße " +"korrigieren!" + +#: routesetting.lua +msgid "" +"Turnout/component missing at @1. Please update track section or reconfigure " +"route!" +msgstr "Weiche/Komponente bei @1 nicht gefunden. Bitte Fahrstraße korrigieren!" + +#: signal_aspect_ui.lua +msgid "<assign distant>" +msgstr "<entf. Hauptsignal festl.>" + +#: signal_aspect_ui.lua +msgid "<none>" +msgstr "<kein>" + +#: signal_aspect_ui.lua +msgid "Assigned distant signal to the main signal at @1" +msgstr "Vorsignal dem Hauptsignal bei @1 zugewiesen" + +#: signal_aspect_ui.lua +msgid "Assigned signal to the TCB at @1" +msgstr "Signal der Gleisabschnittsgrenze bei @1 zugewiesen" + +#: signal_aspect_ui.lua tool.lua +msgid "Clear" +msgstr "Leeren" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Influence point of another signal is already present!" +msgstr "" +"Signal einstellen: Beeinflussungspunkt eines anderen Signals bereits " +"vorhanden!" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Node is too far away. Aborted." +msgstr "Signal einstellen: Block ist zu weit entfernt. Abbruch." + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Please look in train's driving direction and punch rail " +"to set influence point." +msgstr "" +"Signal einstellen: In Fahrtrichtung schauen und Gleis schlagen, um " +"Beeinflussungspunkt zu setzen." + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Successfully set influence point" +msgstr "Signal einstellen: Beeinflussungspunkt erfolgreich gesetzt" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: This is not a normal two-connection rail! Aborted." +msgstr "Signal einstellen: Dies ist kein geeignetes Gleis! Abbruch." + +#: signal_aspect_ui.lua +msgid "Dst: @1" +msgstr "Haupts.: @1" + +#: signal_aspect_ui.lua +msgid "Influence point is not set." +msgstr "Beeinflussungspunkt ist nicht gesetzt." + +#: signal_aspect_ui.lua +msgid "Influence point is set at @1." +msgstr "Beeinflussungspunkt ist gesetzt bei @1." + +#: signal_aspect_ui.lua +msgid "Modify" +msgstr "Bearbeiten" + +#: signal_aspect_ui.lua +msgid "Set distant signal: Punch the main signal to assign!" +msgstr "Hauptsignal zuweisen: Bitte schlage das Hauptsignal!" + +#: signal_aspect_ui.lua +msgid "Set influence point" +msgstr "Beeinflussungspunkt setzen" + +#: smartroute.lua +msgid "Apply" +msgstr "Anwenden" + +#: smartroute.lua +msgid "Route search: @1 found" +msgstr "Fahrstraßensuche: @1 gefunden" + +#: smartroute.lua +msgid "Search further" +msgstr "Weitersuchen" + +#: smartroute.lua +msgid "Smartroute: No track section directly ahead!" +msgstr "Fahrstraßensuche: Kein Gleisabschnitt voraus!" + +#: smartroute.lua +msgid "Smartroute: TCBS or routes don't exist here!" +msgstr "" +"Fahrstraßensuche: Gleisabschnittsgrenze oder Fahrstraßen existieren hier " +"nicht!" + +#: tcb_ts_ui.lua +msgid " (invalid)" +msgstr "(ungültig)" + +#: tcb_ts_ui.lua +msgid "@1 locks in state @2" +msgstr "@1 gesperrt in Position @2" + +#: tcb_ts_ui.lua +msgid "A route is requested from this signal:" +msgstr "Fahrstraße von diesem Signal:" + +#: tcb_ts_ui.lua +msgid "Add locks" +msgstr "Sperre hinzu." + +#: tcb_ts_ui.lua +msgid "Assign a signal" +msgstr "Signal zuweisen" + +#: tcb_ts_ui.lua +msgid "Automatic Working is active." +msgstr "Automatischer Blockbetrieb aktiv." + +#: tcb_ts_ui.lua +msgid "Automatic routesetting" +msgstr "ARS (autom. Fahrstraßenauswahl)" + +#: tcb_ts_ui.lua +msgid "Boundary TCBs:" +msgstr "Gleisabschnittsgrenzen:" + +#: tcb_ts_ui.lua +msgid "Can't remove TCB: Both sides must have no signal assigned!" +msgstr "" +"Kann Gleisabschnittsgrenze nicht entfernen: mindestens eine Seite hat noch " +"ein Signal zugewiesen!" + +#: tcb_ts_ui.lua +msgid "Can't remove track, a train is here!" +msgstr "Kann Gleisabschnittsgrenze nicht entfernen: hier ist noch ein Zug!" + +#: tcb_ts_ui.lua +msgid "Cancel" +msgstr "Abbruch" + +#: tcb_ts_ui.lua +msgid "Cancel Route" +msgstr "Fahrstraße auflösen" + +#: tcb_ts_ui.lua +msgid "" +"Cannot delete route which has ARS rules, please review and then delete " +"through edit dialog!" +msgstr "" +"Fahrstraße hat ARS-Regeln, bitte überprüfe diese und lösche die Fahrstraße " +"über den Bearbeitungsdialog!" + +#: tcb_ts_ui.lua +msgid "Clear locks" +msgstr "Sperren löschen" + +#: tcb_ts_ui.lua +msgid "" +"Configuring TCB: Already existed at this position, it is now linked to this " +"TCB marker" +msgstr "" +"Gleisabschnittsgrenze einstellen: Existierte hier bereits, der Marker ist " +"nun verbunden" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Cannot use static signals for routesetting. Aborted." +msgstr "" +"Gleisabschnittsgrenze einstellen: statische Signale können nicht für " +"Fahrstraßen benutzt werden. Abbruch." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Internal error, TCBS doesn't exist. Aborted." +msgstr "" +"Gleisabschnittsgrenze einstellen: Interner Fehler, TCB existiert nicht. " +"Abbruch." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Node is too far away. Aborted." +msgstr "Gleisabschnittsgrenze einstellen: Block ist zu weit entfernt. Abbruch." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Not a compatible signal. Aborted." +msgstr "Gleisabschnittsgrenze einstellen: Kein kompatibles Signal. Abbruch." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the rail you want to assign this TCB to." +msgstr "" +"Gleisabschnittsgrenze einstellen: Bitte das Gleis schlagen, wo die Grenze " +"erstellt werden soll." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the signal to assign." +msgstr "" +"Gleisabschnittsgrenze einstellen: Bitte das zuzuweisende Signal schlagen." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully assigned signal." +msgstr "Gleisabschnittsgrenze einstellen: Signal erfolgreich zugewiesen." + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully configured TCB" +msgstr "Gleisabschnittsgrenze einstellen: Grenze erfolgreich erstellt" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: This is not a normal two-connection rail! Aborted." +msgstr "" +"Gleisabschnittsgrenze einstellen: Dies ist kein geeignetes Gleis! Abbruch." + +#: tcb_ts_ui.lua +msgid "Create Interlocked Track Section" +msgstr "Gleisabschnitt anlegen" + +#: tcb_ts_ui.lua +msgid "Delete this route" +msgstr "Fahrstraße löschen" + +#: tcb_ts_ui.lua +msgid "Disable Automatic Working" +msgstr "Auto. Blockbetrieb aus" + +#: tcb_ts_ui.lua +msgid "Distant signal triggers ARS" +msgstr "Vorsignal kann ARS auslösen" + +#: tcb_ts_ui.lua +msgid "Edit" +msgstr "Bearbeiten" + +#: tcb_ts_ui.lua +msgid "Enable Automatic Working" +msgstr "Automatischer Blockbetrieb" + +#: tcb_ts_ui.lua +msgid "Error: TS modified, abort!" +msgstr "Fehler: Abschnitt verändert, Abbruch!" + +#: tcb_ts_ui.lua +msgid "Final TCBS unset (legacy-style buffer route)" +msgstr "Letzte Abschnittsgrenze fehlt (Prellbockroute aus älterer Version)" + +#: tcb_ts_ui.lua +msgid "Fixed route locks (e.g. level crossings):" +msgstr "Feste Fahrstraßensperren (z.B. Bahnübergang):" + +#: tcb_ts_ui.lua +msgid "Link @1" +msgstr "Verknüpfe @1" + +#: tcb_ts_ui.lua +msgid "Link: @1" +msgstr "Verknüpfung: @1" + +#: tcb_ts_ui.lua +msgid "Multiple routes are requested (first available is set):" +msgstr "Mehrere Fahrstraßen angefragt (erste verfügbare wird eingestellt):" + +#: tcb_ts_ui.lua +msgid "NOTE: ARS is disabled." +msgstr "ACHTUNG: ARS deaktiviert!" + +#: tcb_ts_ui.lua +msgid "New (Manual)" +msgstr "Neu (Manuell)" + +#: tcb_ts_ui.lua +msgid "No Link" +msgstr "Keine Verknüpfung" + +#: tcb_ts_ui.lua +msgid "No routes are yet defined." +msgstr "Bisher keine Fahrstraßen definiert." + +#: tcb_ts_ui.lua +msgid "No trains on this section." +msgstr "Keine Züge auf diesem Abschnitt." + +#: tcb_ts_ui.lua +msgid "Punch components to add fixed locks. (punch anything else = end)" +msgstr "" +"Schlage auf Komponenten um diese zu sperren (schlage irgendetwas anderes = " +"Ende)" + +#: tcb_ts_ui.lua +msgid "Remove Section" +msgstr "Gleisabschnitt löschen" + +#: tcb_ts_ui.lua +msgid "Reset section state" +msgstr "Gleisabschnitt zurücksetzen" + +#: tcb_ts_ui.lua +msgid "Reset track section" +msgstr "Gleisabschnitt zurücksetzen" + +#: tcb_ts_ui.lua +msgid "Reset track section @1!" +msgstr "Streckenabschnitt @1 zurückgesetzt!" + +#: tcb_ts_ui.lua +msgid "Route has been set." +msgstr "Fahrstraße ist festgelegt." + +#: tcb_ts_ui.lua +msgid "Route is re-set when a train passed." +msgstr "Fahrstraße wird nach Passieren eines Zuges nicht aufgelöst." + +#: tcb_ts_ui.lua +msgid "Route is set over this signal by:" +msgstr "Eine Fahrstraße ist über dieses Signal gestellt von:" + +#: tcb_ts_ui.lua +msgid "Route is set: " +msgstr "Fahrstraße ist festgelegt: " + +#: tcb_ts_ui.lua +msgid "Routes are not automatically set." +msgstr "Fahrstraßen werden nicht automatisch gestellt." + +#: tcb_ts_ui.lua +msgid "Routes:" +msgstr "Fahrstraßen:" + +#: tcb_ts_ui.lua +msgid "Section holds @1 route locks." +msgstr "Abschnitt hält @1 Sperren." + +#: tcb_ts_ui.lua +msgid "Section name" +msgstr "Name des Streckenabschnitts" + +#: tcb_ts_ui.lua +msgid "Set ARS default route" +msgstr "Setze als ARS-Standardroute" + +#: tcb_ts_ui.lua +msgid "Set Route" +msgstr "Fahrstraße einstellen" + +#: tcb_ts_ui.lua +msgid "Setting fixed locks finished!" +msgstr "Feste Fahrstraßensperren hinzugefügt!" + +#: tcb_ts_ui.lua +msgid "Show" +msgstr "Anzeigen" + +#: tcb_ts_ui.lua +msgid "Show track section" +msgstr "Gleisabschnitt anzeigen" + +#: tcb_ts_ui.lua +msgid "Side @1" +msgstr "Seite @1" + +#: tcb_ts_ui.lua +msgid "Signal at @1" +msgstr "Signal bei @1" + +#: tcb_ts_ui.lua +msgid "Signal name" +msgstr "Signalname" + +#: tcb_ts_ui.lua +msgid "Signal on B side already assigned!" +msgstr "Signal auf Seite B bereits zugewiesen!" + +#: tcb_ts_ui.lua +msgid "Signalling" +msgstr "Fahrstraßen stellen" + +#: tcb_ts_ui.lua +msgid "Smart Route" +msgstr "Fahrstraßensuche" + +#: tcb_ts_ui.lua +msgid "TCB Link: Select linked TCB now!" +msgstr "" +"Gleisabschnitte verknüpfen: Zu verknüpfende Gleisabschnittsgrenze jetzt " +"auswählen!" + +#: tcb_ts_ui.lua +msgid "TCB already existed at this position, now linked to this node" +msgstr "" +"Gleisabschnittsgrenze existierte hier bereits, der Block ist nun verbunden" + +#: tcb_ts_ui.lua +msgid "TCB assigned to @1" +msgstr "Gleisabschnittsgrenze an @1 zugewiesen" + +#: tcb_ts_ui.lua +msgid "This TCB has been removed. Please dig marker." +msgstr "Gleisabschnittsgrenze wurde gelöscht. Bitte Marker entfernen." + +#: tcb_ts_ui.lua +msgid "" +"This is a pure distant signal\n" +"No route is currently set through." +msgstr "" +"Dies ist ein reines Vorsignal\n" +"Aktuell keine Fahrstraße eingestellt." + +#: tcb_ts_ui.lua +msgid "" +"This is an always-halt signal (e.g. a buffer)\n" +"No routes can be set from here." +msgstr "" +"Dies ist ein Haltsignal (z.B. Prellbock)\n" +"Von hier aus können keine Fahrstraßen eingestellt werden." + +#: tcb_ts_ui.lua +msgid "" +"This will clear the list of trains\n" +"and the routesetting status of this section.\n" +"Are you sure?" +msgstr "" +"Dies löscht die Liste der Züge im Abschnitt\n" +"sowie den Fahrstraßenstatus.\n" +"Sind Sie sicher?" + +#: tcb_ts_ui.lua +msgid "" +"This will remove the track section and set all its end points to End Of " +"Interlocking" +msgstr "Dies wird den Gleisabschnitt löschen" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break" +msgstr "Gleisabschnittsgrenze" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break Configuration" +msgstr "Einstellungen der Gleisabschnittsgrenze" + +#: tcb_ts_ui.lua +msgid "Track Section Detail - @1" +msgstr "Gleisabschnitts-Details - @1" + +#: tcb_ts_ui.lua +msgid "Trains on this section:" +msgstr "Züge in diesem Abschnitt" + +#: tcb_ts_ui.lua +msgid "Unconfigured Track Circuit Break, right-click to assign." +msgstr "" +"Nicht konfiguierte Gleisabschnittsgrenze (TCB). Rechtsklick zum Zuweisen." + +#: tcb_ts_ui.lua +msgid "Wait for this route to be cancelled in order to do anything here." +msgstr "Erst nach Auflösung dieser Fahrstraße kann von hier gestellt werden." + +#: tcb_ts_ui.lua +msgid "Waiting for route to be set..." +msgstr "Warten, bis Fahrstraße verfügbar ist..." + +#: tcb_ts_ui.lua +msgid "Yes" +msgstr "Ja" + +#: tcb_ts_ui.lua +msgid "" +"You cannot modify track sections when a route is set or a train is on the " +"section." +msgstr "" +"Abschnitt kann nicht bearbeitet werden, wenn eine Fahrstraße gesetzt ist " +"oder der Abschnitt belegt ist." + +#: tool.lua +msgid "Emplace manual lock" +msgstr "Manuelle Sperre setzen" + +#: tool.lua +msgid "" +"Interlocking tool\n" +"Punch: Highlight track section\n" +"Place: check route locks/show track section info" +msgstr "" +"Zugsicherungswerkzeug\n" +"Schlagen: Gleisabschnitte hervorheben\n" +"Platzieren: Gleisabschnittsinformation/Fahrstraßensperren anzeigen" + +#: tool.lua +msgid "No route locks set" +msgstr "Keine Fahrstraßensperren gehalten" + +#: tool.lua +msgid "No track section at this location!" +msgstr "Kein Gleisabschnitt gefunden!" + +#: tool.lua +msgid "Node is not a track!" +msgstr "Block ist kein Gleis!" + +#: tool.lua +msgid "Route lock inspector" +msgstr "Fahrstraßensperren-Inspektor" + +#: tool.lua +msgid "Route locks currently put:" +msgstr "Gesetzte Fahrstraßensperren:" + +#: tsr_rail.lua +msgid "Point Speed Restriction Track" +msgstr "Geschwindigkeitskontrollgleis" + +#: tsr_rail.lua +msgid "Point speed restriction: @1" +msgstr "Geschwindigkeitskontrolle: @1" + +#: tsr_rail.lua +msgid "Set point speed restriction:" +msgstr "Setze Kontrollgeschwindigkeit:" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track without the @1 privilege." +msgstr "Sie dürfen ohne das „@1“-Privileg dieses Gleis nicht konfigurieren." + +#: tsr_rail.lua +msgid "You are not allowed to configure this track." +msgstr "Sie dürfen dieses Gleis nicht konfigurieren." + +#~ msgid "(Doors closed)" +#~ msgstr "(Türen geschlossen)" + +#~ msgid "3-way turnout" +#~ msgstr "Dreiwegweiche" + +#~ msgid "90+Angle Diamond Crossing Track" +#~ msgstr "Kreuzung mit einem achsenparallelen Gleis" + +#~ msgid "<No coupler>" +#~ msgstr "<Keine Kupplung vorhanden>" + +#~ msgid "@1 Platform (45 degree)" +#~ msgstr "Hoher @1-Bahnsteig (45°)" + +#~ msgid "@1 Platform (high)" +#~ msgstr "Hoher @1-Bahnsteig" + +#~ msgid "@1 Platform (low)" +#~ msgstr "Niedriger @1-Bahnsteig" + +#~ msgid "@1 Platform (low, 45 degree)" +#~ msgstr "Niedriger @1-Bahnsteig (45°)" + +#~ msgid "@1 Slope" +#~ msgstr "@1 Steigung" + +#~ msgid "ATC Kick command warning: doors are closed." +#~ msgstr "" +#~ "Zugbeeinflussung: Wegen geschlossener Türen werden Fahrgäste nicht zum " +#~ "Ausstieg gezwungen." + +#~ msgid "ATC Kick command warning: train moving." +#~ msgstr "" +#~ "Zugbeeinflussung: Der Zug befindet sich in Bewegung, Fahrgäste werden " +#~ "nicht zum Ausstieg gezwungen." + +#~ msgid "ATC Reverse command warning: didn't reverse train, train moving." +#~ msgstr "" +#~ "Zugbeeinflussung: Der Zug befindet sich in Bewegung und kann nicht " +#~ "umgekehrt werden." + +#~ msgid "ATC command parse error: Unknown command: @1" +#~ msgstr "Zugbeeinflussung: Unbekannter Befehl: @1" + +#~ msgid "ATC command syntax error: I statement not closed: @1" +#~ msgstr "Zugbeeinflussung: Unvollständiger I-Befehl: @1" + +#~ msgid "ATC controller" +#~ msgstr "Zugbeeinflussungsgleis" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Channel: @2" +#~ msgstr "" +#~ "Zugbeeinflussungsgleis in Betriebsart „@1“\n" +#~ "Kanal: @2" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Command: @2" +#~ msgstr "" +#~ "Zugbeeinflussungsgleis in Betriebsart „@1“\n" +#~ "Befehl: @2" + +#~ msgid "Access to @1" +#~ msgstr "Zugang zu @1" + +#~ msgid "Andrew's Cross" +#~ msgstr "Andreaskreuz" + +#~ msgid "Back of train would end up off track, cancelling." +#~ msgstr "Der hinterer Teil dez Zuges wäre nicht auf dem Gleis." + +#~ msgid "Big Industrial Train Engine" +#~ msgstr "Große Industrielle Lokomotive" + +#~ msgid "Box Wagon" +#~ msgstr "Güterwaggon" + +#~ msgid "Buffer and Chain Coupler" +#~ msgstr "Schraubenkupplung" + +#~ msgid "Bumper" +#~ msgstr "Prellbock" + +#~ msgid "Can not couple: The couplers of the trains do not match (@1 and @2)." +#~ msgstr "Die Kupplungen der Züge passen nicht zueinander (@1 und @2)." + +#~ msgid "" +#~ "Can place and configure LuaATC components, including execute potentially " +#~ "harmful Lua code" +#~ msgstr "" +#~ "Kann LuaATC-Bauteile platzieren und konfigurieren (auch evtl. schädliche " +#~ "Programme ausführen)" + +#~ msgid "Can't get on: wagon full or doors closed!" +#~ msgstr "" +#~ "Sie können nicht einsteigen: der Waggon ist voll oder die Türen sind " +#~ "geschlossen." + +#, fuzzy +#~ msgid "Can't place: Not enough slope items left (@1 required)" +#~ msgstr "" +#~ "Es kann nicht platziert werden: Sie haben nicht genug Steigungsblöcke, es " +#~ "werden insgesamt @1 benötigt." + +#, fuzzy +#~ msgid "Can't place: There's no slope of length @1" +#~ msgstr "" +#~ "Es kann nicht platziert werden: die Steigung der Länge @1 ist nicht " +#~ "definiert." + +#, fuzzy +#~ msgid "Can't place: no supporting node at upper end." +#~ msgstr "" +#~ "Es kann nicht platziert werden: es gibt keinen unterstützenden Block am " +#~ "Ende der Steigung." + +#, fuzzy +#~ msgid "Can't place: not pointing at node" +#~ msgstr "Es kann nicht platziert werden: Sie zeigen nicht auf einem Block." + +#~ msgid "Can't place: protected position!" +#~ msgstr "Es kann nicht platziert werden: diese Position ist geschützt." + +#, fuzzy +#~ msgid "Can't place: space occupied!" +#~ msgstr "Es kann nicht platziert werden: Diese Position ist besetzt." + +#~ msgid "Command" +#~ msgstr "Befehl" + +#~ msgid "Command (on)" +#~ msgstr "Befehl (wenn aktiviert)" + +#~ msgid "Default Seat (driver stand)" +#~ msgstr "Standardsitzplatz (Führerstand)" + +#~ msgid "Dep. Speed" +#~ msgstr "Zielgeschwindigkeit bei Abfahrt" + +#~ msgid "Deprecated Track" +#~ msgstr "ausrangiertes Gleis, nicht verwenden." + +#~ msgid "Detailed Steam Engine" +#~ msgstr "Detaillierte Dampflokomotive" + +#~ msgid "Detector Rail" +#~ msgstr "Detektorgleis" + +#~ msgid "Diagonal Diamond Crossing Track" +#~ msgstr "Diagonale Gleiskreuzung" + +#~ msgid "Digiline channel" +#~ msgstr "Digiline-Kanal" + +#~ msgid "Door Delay" +#~ msgstr "Zeit für die Türschließung" + +#~ msgid "Door Side" +#~ msgstr "Türseite" + +#~ msgid "Doors are closed! (Try holding sneak key!)" +#~ msgstr "Die Türen sind geschlossen." + +#~ msgid "" +#~ "Doors are closed. Use Sneak+rightclick to ignore the closed doors and get " +#~ "off." +#~ msgstr "" +#~ "Die Türen sind geschlossen. Nutzen Sie Schleichen+Rechtsklick, um trotz " +#~ "geschlossener Türen auszusteigen." + +#, fuzzy +#~ msgid "Driver Stand" +#~ msgstr "Führerstand" + +#~ msgid "Driver Stand (left)" +#~ msgstr "Führerstand Links" + +#~ msgid "Driver Stand (right)" +#~ msgstr "Führerstand Rechts" + +#~ msgid "Driver stand" +#~ msgstr "Führerstand" + +#~ msgid "Driver's cab" +#~ msgstr "Führerstand" + +#~ msgid "Get off" +#~ msgstr "Aussteigen" + +#~ msgid "Get off (forced)" +#~ msgstr "Ausstieg zwingen" + +#~ msgid "Industrial Train Engine" +#~ msgstr "Industrielle Lokomotive" + +#~ msgid "Industrial tank wagon" +#~ msgstr "Tankwaggon" + +#~ msgid "Industrial wood wagon" +#~ msgstr "Holztransportwaggon" + +#~ msgid "Japanese Train Engine" +#~ msgstr "Japanische Personenzug-Lokomotive" + +#~ msgid "Japanese Train Inter-Wagon Connection" +#~ msgstr "Waggonzwischenverbindung Japanischer Personenzüge" + +#~ msgid "Japanese Train Wagon" +#~ msgstr "Japanischer Personenzug-Passagierwaggon" + +#, fuzzy +#~ msgid "Japanese signal pole" +#~ msgstr "Japanischer Personenzug-Passagierwaggon" + +#~ msgid "Kick out passengers" +#~ msgstr "Fahrgäste zum Ausstieg zwingen" + +#~ msgid "Lampless Signal" +#~ msgstr "Mechanisches Signal" + +#~ msgid "Line" +#~ msgstr "Linie" + +#~ msgid "Loading Track" +#~ msgstr "Beladungsgleis" + +#~ msgid "Lock couples" +#~ msgstr "Kupplungen sperren" + +#~ msgid "LuaATC component with error: @1" +#~ msgstr "LuaATC-Bauteil mit Fehlermeldung: @1" + +#~ msgid "No such lua entity." +#~ msgstr "" +#~ "Sie zeigen nicht auf einem Objekt, das mit diesem Werkzeug kopiert werden " +#~ "kann." + +#~ msgid "No such train: @1." +#~ msgstr "Es gibt keinen mit „@1“ identifizierbaren Zug." + +#~ msgid "No such wagon: @1." +#~ msgstr "Es gibt keinen mit „@1“ identifizierbaren Waggon." + +#, fuzzy +#~ msgid "Not allowed to do this." +#~ msgstr "Sie dürfen dieses Gleis nicht konfigurieren." + +#~ msgid "Passenger Wagon" +#~ msgstr "Passagierwaggon" + +#, fuzzy +#~ msgid "Passenger area" +#~ msgstr "Passagierwaggon" + +#~ msgid "" +#~ "Passive Component Naming Tool\n" +#~ "\n" +#~ "Right-click to name a passive component." +#~ msgstr "" +#~ "PC-Benennungswerkzeug\n" +#~ "\n" +#~ "Rechtsklick zur Benennung der passiven Komponente." + +#~ msgid "Perpendicular Diamond Crossing Track" +#~ msgstr "Kreuzung mit zueinander orthogonalen Gleisen" + +#~ msgid "Position is occupied by a train." +#~ msgstr "Ein Zug steht an dieser Position." + +#~ msgid "Save" +#~ msgstr "Speichern" + +#~ msgid "Save wagon properties" +#~ msgstr "Waggon-Einstellungen speichern" + +#~ msgid "Scharfenberg Coupler" +#~ msgstr "Scharfenbergkupplung" + +#~ msgid "Select seat:" +#~ msgstr "Wählen Sie einen Sitzplatz aus:" + +#~ msgid "Show Inventory" +#~ msgstr "Inventar Zeigen" + +#~ msgid "Speed:" +#~ msgstr "Geschw.:" + +#~ msgid "Station Code" +#~ msgstr "Kennzeichen der Haltestelle" + +#~ msgid "Station code \"@1\" already exists and is owned by @2." +#~ msgstr "" +#~ "Die Haltestelle mit dem Kennzeichen „@1“ ist bereits vorhanden und wird " +#~ "von @2 verwaltet." + +#~ msgid "Station/Stop Track" +#~ msgstr "Gleis zur Kennzeichnung einer Haltestelle" + +#~ msgid "Steam Engine" +#~ msgstr "Dampflokomotive" + +#~ msgid "Stop Time" +#~ msgstr "Wartezeit" + +#~ msgid "Subway Passenger Wagon" +#~ msgstr "U-Bahn-Waggon" + +#~ msgid "Target:" +#~ msgstr "Zielges.:" + +#~ msgid "Text displayed inside train" +#~ msgstr "Innere Anzeige" + +#~ msgid "Text displayed outside on train" +#~ msgstr "Äußere Anzeige" + +#, fuzzy +#~ msgid "That wagon does not exist!" +#~ msgstr "In diesem Waggon ist kein Sitzplatz vorhanden." + +#~ msgid "The clipboard couldn't access the metadata. Copy failed." +#~ msgstr "" +#~ "Wegen des fehlgeschlagenen Zugriffs auf die Metadaten konnte der Zug " +#~ "nicht kopiert werden." + +#~ msgid "The clipboard couldn't access the metadata. Paste failed." +#~ msgstr "" +#~ "Wegen des fehlgeschlagenen Zugriffs auf die Metadaten konnte eine Kopie " +#~ "des Zuges nicht eingefügt werden." + +#~ msgid "The clipboard is empty." +#~ msgstr "Das Clipboard ist leer." + +#, fuzzy +#~ msgid "The track you are trying to place the wagon on is not long enough!" +#~ msgstr "Das Gleis, auf dem der Waggon platziert werden woll, ist zu kurz." + +#~ msgid "The track you are trying to place the wagon on is not long enough." +#~ msgstr "Das Gleis, auf dem der Waggon platziert werden woll, ist zu kurz." + +#~ msgid "The wagon's inventory is not empty." +#~ msgstr "Das Inventar dieses Waggons ist nicht leer." + +#~ msgid "There's a Signal Influence Point here." +#~ msgstr "Hier ist ein Signal-Beeinflussungspunkt." + +#, fuzzy +#~ msgid "This Wagon ID" +#~ msgstr "Der Waggon ist voll." + +#, fuzzy +#~ msgid "This node can't be changed using the trackworker!" +#~ msgstr "Dieser Block kann nicht mit dem Gleiswerkzeug bearbeitet werden." + +#, fuzzy +#~ msgid "This node can't be rotated using the trackworker!" +#~ msgstr "Dieser Block kann nicht mit dem Gleiswerkzeug gedreht werden." + +#~ msgid "This position is protected!" +#~ msgstr "Diese Position ist geschützt!" + +#~ msgid "This station is owned by @1. You are not allowed to edit its name." +#~ msgstr "" +#~ "Diese Haltestelle wird von @1 verwaltet. Sie dürfen sie nicht umbenennen." + +#~ msgid "This track can not be changed." +#~ msgstr "Dieses Gleis kann nicht geändert werden." + +#, fuzzy +#~ msgid "This track can not be removed!" +#~ msgstr "Dieses Gleis kann nicht entfernt werden." + +#, fuzzy +#~ msgid "This track can not be rotated!" +#~ msgstr "Dieses Gleis kann nicht gedreht werden." + +#~ msgid "This wagon has no seats." +#~ msgstr "In diesem Waggon ist kein Sitzplatz vorhanden." + +#~ msgid "This wagon is full." +#~ msgstr "Der Waggon ist voll." + +#~ msgid "This wagon is owned by @1, you can't destroy it." +#~ msgstr "Dieser Waggon gehört @1, Sie dürfen ihn nicht abbauen." + +#~ msgid "Track" +#~ msgstr "Gleis" + +#~ msgid "" +#~ "Track Worker Tool\n" +#~ "\n" +#~ "Left-click: change rail type (straight/curve/switch)\n" +#~ "Right-click: rotate object" +#~ msgstr "" +#~ "Gleiswerkzeug\n" +#~ "\n" +#~ "Linksklick: Gleistyp ändern\n" +#~ "Rechtsklick: Objekt drehen" + +#, fuzzy +#~ msgid "Train " +#~ msgstr "Der Zug wurde Kopiert." + +#~ msgid "Train copied." +#~ msgstr "Der Zug wurde Kopiert." + +#~ msgid "" +#~ "Train copy/paste tool\n" +#~ "\n" +#~ "Left-click: copy train\n" +#~ "Right-click: paste train" +#~ msgstr "" +#~ "Werkzeug zur Erstellung von Zugkopien\n" +#~ "\n" +#~ "Linksklick: Zug ins Clipboard kopieren\n" +#~ "Right-click: Kopierten Zug einfügen" + +#~ msgid "Unconfigured ATC controller" +#~ msgstr "Nicht konfiguiertes Zugbeeinflussungsgleis" + +#~ msgid "Unconfigured LuaATC component" +#~ msgstr "Nicht konfiguierter LuaATC-Bauteil" + +#~ msgid "Unloading Track" +#~ msgstr "Abladungsgleis" + +#~ msgid "Use Sneak+rightclick to bypass closed doors!" +#~ msgstr "" +#~ "Nutzen Sie Schleichen+Rechtsklick, um trotz geschlossener Türen " +#~ "einzusteigen." + +#, fuzzy +#~ msgid "Wagon Properties Tool" +#~ msgstr "Waggon-Einstellungen" + +#~ msgid "" +#~ "Wagon needs to be decoupled from other wagons in order to destroy it." +#~ msgstr "Der Waggon muss abgekoppelt sein, damit Sie ihn abbauen können." + +#~ msgid "Wagon properties" +#~ msgstr "Waggon-Einstellungen" + +#~ msgid "Wallmounted Signal (left)" +#~ msgstr "An der linken Seite montiertes Signal" + +#~ msgid "Wallmounted Signal (right)" +#~ msgstr "An der rechten Seite montiertes Signal" + +#~ msgid "Wallmounted Signal (top)" +#~ msgstr "An der Decke montiertes Signal" + +#~ msgid "" +#~ "Warning: If you destroy this wagon, you only get some steel back! If you " +#~ "are sure, hold Sneak and left-click the wagon." +#~ msgstr "" +#~ "Warnung: Durch den Abbau des Waggons erhalten Sie nur etwas Stahl zurück. " +#~ "Nutzen Sie Schleichen+Linksklick, um dem Waggon abzubauen." + +#~ msgid "Y-turnout" +#~ msgstr "Y-Weiche" + +#~ msgid "You are not allowed to access the driver stand." +#~ msgstr "Sie haben keinen Zugang zum Führerstand." + +#~ msgid "You are not allowed to build near tracks at this protected position." +#~ msgstr "" +#~ "Sie dürfen an geschützten Stellen nicht in der Nähe von Gleisen bauen." + +#~ msgid "" +#~ "You are not allowed to build near tracks without the track_builder " +#~ "privilege." +#~ msgstr "" +#~ "Sie dürfen ohne das „track_builder“-Privileg nicht in der Nähe von " +#~ "Gleisen bauen." + +#~ msgid "You are not allowed to build tracks at this protected position." +#~ msgstr "Sie dürfen an geschützten Stellen kein Gleis bauen." + +#~ msgid "" +#~ "You are not allowed to build tracks without the track_builder privilege." +#~ msgstr "Sie dürfen ohne das „track_builder“-Privileg kein Gleis bauen." + +#~ msgid "" +#~ "You are not allowed to configure this LuaATC component without the @1 " +#~ "privilege." +#~ msgstr "" +#~ "Sie dürfen ohne das „@1“-Privileg diesen LuaATC-Bauteil nicht " +#~ "konfigurieren." + +#~ msgid "" +#~ "You are not allowed to couple trains without the train_operator privilege." +#~ msgstr "Sie dürfen ohne das „train_operator“-Privileg keine Züge ankuppeln." + +#, fuzzy +#~ msgid "You are not allowed to modify this protected track." +#~ msgstr "Sie dürfen an geschützten Stellen kein Gleis bauen." + +#~ msgid "" +#~ "You are not allowed to name LuaATC passive components without the @1 " +#~ "privilege." +#~ msgstr "Sie dürfen ohne das „@1“ keinen passiven LuaATC-Bauteil benennen." + +#~ msgid "" +#~ "You are not allowed to operate turnouts and signals without the " +#~ "railway_operator privilege." +#~ msgstr "" +#~ "Sie dürfen ohne das „railway_operator“-Privileg keine Bahnanlage " +#~ "operieren." + +#~ msgid "You can't get on this wagon." +#~ msgstr "Sie können nicht in diesen Waggon einsteigen." + +#~ msgid "You do not have the @1 privilege." +#~ msgstr "Ihnen fehlt das „@1“-Privileg." + +#, fuzzy +#~ msgid "You don't have the train_operator privilege." +#~ msgstr "Ihnen fehlt das „@1“-Privileg." + +#~ msgid "" +#~ "You need to own at least one neighboring wagon to destroy this couple." +#~ msgstr "" +#~ "Sie müssen Besitzer eines angrenzenden Waggons sein, um hier abzukuppeln." diff --git a/advtrains_interlocking/po/fr.po b/advtrains_interlocking/po/fr.po new file mode 100644 index 0000000..1ebf2bb --- /dev/null +++ b/advtrains_interlocking/po/fr.po @@ -0,0 +1,1629 @@ +msgid "" +msgstr "" +"Project-Id-Version: advtrains\n" +"Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n" +"POT-Creation-Date: 2025-06-11 23:21+0200\n" +"PO-Revision-Date: 2025-03-25 15:06+0100\n" +"Last-Translator: Tanavit <tanavit@posto.ovh>\n" +"Language-Team: French\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.2\n" + +#: autonaming.lua +msgid "Prefix set, next signal name will be: @1" +msgstr "" + +#: autonaming.lua +msgid "Prefix unset, signals are not auto-named for you!" +msgstr "" + +#: autonaming.lua +msgid "" +"Sets the current prefix for automatically naming interlocking components. " +"Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on" +msgstr "" + +#: database.lua +msgid "Created track section @1 from @2 TCBs" +msgstr "" + +#: database.lua +msgid "Track section inconsistent here, repairing..." +msgstr "" + +#: database.lua +msgid "Track section partition found, repairing..." +msgstr "" + +#: init.lua +msgid "Can set up track sections, routes and signals" +msgstr "" + +#: route_prog.lua +msgid "@1 Terminal @2" +msgstr "" + +#: route_prog.lua +msgid "@1 is held in @2 position when this route is set and freed " +msgstr "" + +#: route_prog.lua +msgid "@1 is no longer affected when this route is set." +msgstr "" + +#: route_prog.lua +msgid "Added track section @1 to the route." +msgstr "" + +#: route_prog.lua +msgid "Advance to next route section" +msgstr "" + +#: route_prog.lua +msgid "Advance/Complete Route" +msgstr "" + +#: route_prog.lua +msgid "Advancing over next section is" +msgstr "" + +#: route_prog.lua +msgid "Cancel if you are unsure!" +msgstr "" + +#: route_prog.lua +msgid "Cancel route programming" +msgstr "" + +#: route_prog.lua +msgid "Cannot program route without a target" +msgstr "" + +#: route_prog.lua tcb_ts_ui.lua +msgid "End of interlocking" +msgstr "" + +#: route_prog.lua +msgid "Enter Route Name" +msgstr "" + +#: route_prog.lua +msgid "Finish programming route" +msgstr "" + +#: route_prog.lua +msgid "Finish route HERE" +msgstr "" + +#: route_prog.lua +msgid "Finish route at end of NEXT section" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 (punch to unfix)" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 until segment #@3 is freed." +msgstr "" + +#: route_prog.lua route_ui.lua signal_aspect_ui.lua tcb_ts_ui.lua tool.lua +msgid "Insufficient privileges to use this!" +msgstr "Privilèges insuffisants pour utiliser ceci !" + +#: route_prog.lua +msgid "Next section is diverging (>2 TCBs)" +msgstr "" + +#: route_prog.lua +#, fuzzy +msgid "Route discarded." +msgstr "Changement d'état de l'itinéraire." + +#: route_prog.lua +msgid "Route ends at signal:" +msgstr "" + +#: route_prog.lua +msgid "Route leads into" +msgstr "" + +#: route_prog.lua +msgid "" +"Route programming mode active. Punch TCBs to add route segments, punch " +"turnouts to lock them." +msgstr "" + +#: route_prog.lua +msgid "Route section @1 removed." +msgstr "" + +#: route_prog.lua +msgid "Routes should in most cases end at signals." +msgstr "" + +#: route_prog.lua +msgid "Save Route" +msgstr "" + +#: route_prog.lua +msgid "Step back one section" +msgstr "" + +# Routage est il le bon terme ? +#: route_prog.lua +#, fuzzy +msgid "Successfully programmed route." +msgstr "Succès d'invalidation des routages des trains" + +#: route_prog.lua +msgid "The origin TCB has become unknown during programming. Try again." +msgstr "" + +#: route_prog.lua +msgid "This TCB is not suitable as" +msgstr "" + +#: route_prog.lua +msgid "This TCB is unconfigured, you first need to assign it to a rail" +msgstr "" + +#: route_prog.lua +msgid "WARNING: Route does not end at a signal." +msgstr "" + +#: route_prog.lua +msgid "[Route programming] " +msgstr "" + +#: route_prog.lua +msgid "impossible at this place." +msgstr "" + +#: route_prog.lua +msgid "non-interlocked area" +msgstr "" + +#: route_prog.lua +msgid "route continuation." +msgstr "" + +#: route_ui.lua +msgid "<< Select a route part to edit options" +msgstr "" + +#: route_ui.lua +#, fuzzy +msgid "<Default Aspect>" +msgstr "Siège par défaut" + +#: route_ui.lua +msgid "ARS Rule List" +msgstr "" + +#: route_ui.lua +#, fuzzy +msgid "Announce distant signal" +msgstr "Signal distant métro de Munich (" + +#: route_ui.lua +msgid "Back to signal" +msgstr "" + +#: route_ui.lua +msgid "Call-on (section may be occupied)" +msgstr "" + +#: route_ui.lua +msgid "Clone Route" +msgstr "" + +#: route_ui.lua +msgid "Delete Route" +msgstr "" + +#: route_ui.lua +msgid "Error:" +msgstr "" + +#: route_ui.lua +msgid "New From Route" +msgstr "" + +#: route_ui.lua +msgid "No Signal at this TCB" +msgstr "" + +#: route_ui.lua +msgid "Route name" +msgstr "" + +#: route_ui.lua +msgid "Route overview" +msgstr "" + +#: route_ui.lua +msgid "Save ARS List" +msgstr "" + +#: route_ui.lua +msgid "Section Options:" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Set" +msgstr "" + +#: route_ui.lua signal_aspect_ui.lua +#, fuzzy +msgid "Signal Aspect:" +msgstr "Signal" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 has different section than previous TCB" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is not assigned to previous track section" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Track section after @1 missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Turnout/component missing at @1" +msgstr "" + +#: routesetting.lua +msgid "Lock conflict at @1, Held locked by:" +msgstr "" + +#: routesetting.lua +msgid "No TCB found at @1. Please update or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "No track section adjacent to @1. Please reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2, segment #@3" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' already has route set from @2:" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' is occupied!" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' not found!" +msgstr "" + +#: routesetting.lua +msgid "" +"TCB at @1 has different section than previous TCB. Please update track " +"section or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "" +"Turnout/component missing at @1. Please update track section or reconfigure " +"route!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<assign distant>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<none>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned distant signal to the main signal at @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned signal to the TCB at @1" +msgstr "" + +#: signal_aspect_ui.lua tool.lua +msgid "Clear" +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Influence point of another signal is already present!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Node is too far away. Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Please look in train's driving direction and punch rail " +"to set influence point." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Successfully set influence point" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Dst: @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is not set." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is set at @1." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Modify" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set distant signal: Punch the main signal to assign!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set influence point" +msgstr "" + +#: smartroute.lua +msgid "Apply" +msgstr "" + +#: smartroute.lua +msgid "Route search: @1 found" +msgstr "" + +#: smartroute.lua +msgid "Search further" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: No track section directly ahead!" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: TCBS or routes don't exist here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid " (invalid)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "@1 locks in state @2" +msgstr "" + +#: tcb_ts_ui.lua +msgid "A route is requested from this signal:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Add locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Assign a signal" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic Working is active." +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Automatic routesetting" +msgstr "Routage à distance" + +#: tcb_ts_ui.lua +msgid "Boundary TCBs:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove TCB: Both sides must have no signal assigned!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove track, a train is here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Cannot delete route which has ARS rules, please review and then delete " +"through edit dialog!" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Clear locks" +msgstr "Autorisation (procédez)" + +#: tcb_ts_ui.lua +msgid "" +"Configuring TCB: Already existed at this position, it is now linked to this " +"TCB marker" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Cannot use static signals for routesetting. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Internal error, TCBS doesn't exist. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Node is too far away. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Not a compatible signal. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the rail you want to assign this TCB to." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the signal to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully assigned signal." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully configured TCB" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Create Interlocked Track Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Delete this route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Disable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Distant signal triggers ARS" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Edit" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Enable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Error: TS modified, abort!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Final TCBS unset (legacy-style buffer route)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Fixed route locks (e.g. level crossings):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link: @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Multiple routes are requested (first available is set):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "NOTE: ARS is disabled." +msgstr "" + +#: tcb_ts_ui.lua +msgid "New (Manual)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No Link" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No routes are yet defined." +msgstr "" + +#: tcb_ts_ui.lua +msgid "No trains on this section." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Punch components to add fixed locks. (punch anything else = end)" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Remove Section" +msgstr "Routage à distance" + +#: tcb_ts_ui.lua +msgid "Reset section state" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Reset track section" +msgstr "Inversion du sens de marche" + +#: tcb_ts_ui.lua +msgid "Reset track section @1!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route has been set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is re-set when a train passed." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set over this signal by:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set: " +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes are not automatically set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Section holds @1 route locks." +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Section name" +msgstr "Nom de Station" + +#: tcb_ts_ui.lua +msgid "Set ARS default route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Set Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Setting fixed locks finished!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show track section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Side @1" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signal at @1" +msgstr "Signal" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signal name" +msgstr "Signal" + +#: tcb_ts_ui.lua +msgid "Signal on B side already assigned!" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signalling" +msgstr "Signal" + +#: tcb_ts_ui.lua +msgid "Smart Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB Link: Select linked TCB now!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB already existed at this position, now linked to this node" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB assigned to @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "This TCB has been removed. Please dig marker." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is a pure distant signal\n" +"No route is currently set through." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is an always-halt signal (e.g. a buffer)\n" +"No routes can be set from here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will clear the list of trains\n" +"and the routesetting status of this section.\n" +"Are you sure?" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will remove the track section and set all its end points to End Of " +"Interlocking" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Track Circuit Break" +msgstr "Il y a un \"Track Circuit Break\" ici." + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Track Circuit Break Configuration" +msgstr "Il y a un \"Track Circuit Break\" ici." + +#: tcb_ts_ui.lua +msgid "Track Section Detail - @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Trains on this section:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Unconfigured Track Circuit Break, right-click to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Wait for this route to be cancelled in order to do anything here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Waiting for route to be set..." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Yes" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"You cannot modify track sections when a route is set or a train is on the " +"section." +msgstr "" + +#: tool.lua +msgid "Emplace manual lock" +msgstr "" + +#: tool.lua +msgid "" +"Interlocking tool\n" +"Punch: Highlight track section\n" +"Place: check route locks/show track section info" +msgstr "" + +#: tool.lua +msgid "No route locks set" +msgstr "" + +#: tool.lua +msgid "No track section at this location!" +msgstr "" + +#: tool.lua +msgid "Node is not a track!" +msgstr "" + +#: tool.lua +msgid "Route lock inspector" +msgstr "" + +#: tool.lua +msgid "Route locks currently put:" +msgstr "" + +#: tsr_rail.lua +msgid "Point Speed Restriction Track" +msgstr "Voie de point de limitation de vitesse" + +#: tsr_rail.lua +msgid "Point speed restriction: @1" +msgstr "Point de limitation de vitesse : @1" + +#: tsr_rail.lua +msgid "Set point speed restriction:" +msgstr "Placez un point de limitation de vitesse :" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track without the @1 privilege." +msgstr "Vous n'êtes pas autorisé à configurer cette voie sans le privilège @1." + +#: tsr_rail.lua +msgid "You are not allowed to configure this track." +msgstr "Vous n'êtes pas autorisé à configurer cette voie." + +#~ msgid " does not exist or is invalid" +#~ msgstr " n'existe pas ou est invalide" + +#~ msgid " is at " +#~ msgstr " est à la position " + +#~ msgid " units" +#~ msgstr " Unités" + +#~ msgid " wagon:destroy(): data is not set!" +#~ msgstr " Appel de wagon:destroy() : données non définies !" + +#~ msgid "!!! Train off track !!!" +#~ msgstr "!!! Train hors voie !!!" + +#~ msgid "(Doors closed)" +#~ msgstr "(Portes closes)" + +#~ msgid "(log" +#~ msgstr "(log" + +#~ msgid ", using placeholder" +#~ msgstr ", dans un espace réservé" + +#~ msgid "3-way turnout" +#~ msgstr "Embranchement triple" + +#~ msgid "90+Angle Diamond Crossing Track" +#~ msgstr "Croisement perpendiculo-diagonal" + +#~ msgid "<No coupler>" +#~ msgstr "<Pas de coupleur>" + +#~ msgid "@1 Platform (45 degree)" +#~ msgstr "Quai @1 (haut, 45°)" + +#~ msgid "@1 Platform (high)" +#~ msgstr "Quai @1 (haut)" + +#~ msgid "@1 Platform (low)" +#~ msgstr "Quai @1 (bas)" + +#~ msgid "@1 Platform (low, 45 degree)" +#~ msgstr "Quai @1 (bas, 45°)" + +#~ msgid "@1 Slope" +#~ msgstr "Pente @1" + +#~ msgid "ATC Kick command warning: doors are closed." +#~ msgstr "Avertissement commande ATC Éjecter : portes closes." + +#~ msgid "ATC Kick command warning: train moving." +#~ msgstr "Avertissement commande ATC Éjecter : train en mouvement." + +#~ msgid "ATC Reverse command warning: didn't reverse train, train moving." +#~ msgstr "" +#~ "Attention : Commande ATC de renversement impossible car le train se " +#~ "déplace." + +#~ msgid "ATC command parse error: Unknown command: @1" +#~ msgstr "Erreur d'analyse de commande ATC : Commande inconnue : @1" + +#~ msgid "ATC command syntax error: I statement not closed: @1" +#~ msgstr "" +#~ "Erreur de syntaxe de commande ATC : instruction \"I\" incomplète : @1" + +#~ msgid "ATC controller" +#~ msgstr "Controlleur ATC" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Channel: @2" +#~ msgstr "" +#~ "Controlleur ATC, mode @1\n" +#~ "Canal : @2" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Command: @2" +#~ msgstr "" +#~ "Controlleur ATC, mode @1\n" +#~ "Commande : @2" + +#~ msgid "Access to @1" +#~ msgstr "Accès à @1" + +#~ msgid "Advtrains Status: no_action" +#~ msgstr "État d'advtrains : aucune action" + +#~ msgid "Advtrains is already running normally!" +#~ msgstr "Advtrains fonctionne déjà correctement !" + +#~ msgid "Allow these players to access your wagon:" +#~ msgstr "Autoriser ces joueurs à embarquer :" + +#~ msgid "Andrew's Cross" +#~ msgstr "Croix de Saint André" + +#~ msgid "Back of train would end up off track, cancelling." +#~ msgstr "La fin du train serait hors voie : annulation." + +#~ msgid "Big Industrial Train Engine" +#~ msgstr "Grosse locomotive industrielle" + +#~ msgid "Boiler" +#~ msgstr "Chaudière à vapeur" + +#~ msgid "Box Wagon" +#~ msgstr "Wagon de frêt" + +#~ msgid "Buffer and Chain Coupler" +#~ msgstr "Attelage à tampon et vis" + +#~ msgid "Bumper" +#~ msgstr "Heurtoir" + +#~ msgid "Can not couple: The couplers of the trains do not match (@1 and @2)." +#~ msgstr "" +#~ "Accouplement impossible: les attelages des trains ne concordent pas (@1 " +#~ "et @2)." + +#~ msgid "Can operate turnouts and signals in unprotected areas" +#~ msgstr "" +#~ "Possibilité d'opérer des embranchements et signaux dans les zones non " +#~ "protégées" + +#~ msgid "" +#~ "Can place and configure LuaATC components, including execute potentially " +#~ "harmful Lua code" +#~ msgstr "" +#~ "Permet le placement et la configuration de composants LuaATC avec risque " +#~ "d'exécution de code Lua dangereux" + +#~ msgid "Can place and dig tracks in unprotected areas" +#~ msgstr "" +#~ "Possibilité de poser ou retirer des voies dans les zones non protégées" + +#~ msgid "" +#~ "Can place, remove and operate any train, regardless of owner, whitelist, " +#~ "or protection" +#~ msgstr "" +#~ "Possibilité de poser, retirer ou opérer un quelconque train, " +#~ "indépendamment du propriétaire, de la liste blanche ou de protection" + +#~ msgid "Can place, remove and operate trains" +#~ msgstr "Possibilité de poser, retirer ou opérer les trains" + +#~ msgid "Can't get on: wagon full or doors closed!" +#~ msgstr "" +#~ "Embarquement impossible : le wagon est plein ou ses portes sont closes !" + +#~ msgid "Can't place: Not enough slope items left (@1 required)" +#~ msgstr "" +#~ "Placement impossible : quantité insuffisante de voie pentue (@1 manquant)" + +#~ msgid "Can't place: There's no slope of length @1" +#~ msgstr "Placement impossible : il n'y a pas de voie pentue de longueur @1" + +#~ msgid "Can't place: no supporting node at upper end." +#~ msgstr "" +#~ "Placement impossible : pas de nœud d'appui à l'extrémité supérieure." + +#~ msgid "Can't place: not pointing at node" +#~ msgstr "Placement impossible : ne pointe pas un nœud" + +#~ msgid "Can't place: protected position!" +#~ msgstr "Placement impossible : emplacement protégé" + +#~ msgid "Can't place: space occupied!" +#~ msgstr "Placement impossible : espace occupé !" + +#~ msgid "Caution" +#~ msgstr "Attention" + +#~ msgid "Chimney" +#~ msgstr "Cheminée" + +#~ msgid "Clear 'Disable ARS' flag" +#~ msgstr "Effacer le drapeau \"Désactiver l'ARS\"" + +#~ msgid "Clear Local Environment" +#~ msgstr "Effacer l'environnement LuaATC" + +#~ msgid "Closed" +#~ msgstr "Fermé" + +#~ msgid "Code" +#~ msgstr "Code" + +#~ msgid "Command" +#~ msgstr "Commande" + +#~ msgid "Command (on)" +#~ msgstr "Commande (marche)" + +#~ msgid "" +#~ "Crash during advtrains main step - skipping the shutdown save operation " +#~ "to not save inconsistent data!" +#~ msgstr "" +#~ "Crash durant le pas principal d'advtrains - saut de l'opération de " +#~ "sauvegarde de terminaison pour éviter l'enregistrement de données " +#~ "corrompues !" + +#~ msgid "Current FC: " +#~ msgstr "Code de fret courant: " + +#~ msgid "Danger (halt)" +#~ msgstr "Danger (stop)" + +#~ msgid "" +#~ "Data is being saved. While saving, advtrains will remove the players from " +#~ "trains. Save files will be reloaded afterwards!" +#~ msgstr "" +#~ "Données en cours de sauvegarde. Durant cette phase, advtrains débarquera " +#~ "les joueurs des trains. Les fichiers de sauvegarde seront ultérieurement " +#~ "rechargés !" + +#~ msgid "Default Seat (driver stand)" +#~ msgstr "Siège par défaut (poste de pilotage)" + +# Routage est il le bon terme ? +#~ msgid "Delete all train routes, force them to recalculate" +#~ msgstr "Suppression et recalcul de tous les routages" + +#~ msgid "Dep. Speed" +#~ msgstr "Vit. de départ" + +#~ msgid "Deprecated Track" +#~ msgstr "Voie déconseillée" + +#~ msgid "" +#~ "Destroying wagon with inventory, but inventory is not found? Shouldn't " +#~ "happen!" +#~ msgstr "Desctruction d'un wagon avec inventaire introuvable ? Anomalie !" + +#~ msgid "" +#~ "Detach all players, especially the offline ones, from all trains. Use " +#~ "only when no one serious is on a train." +#~ msgstr "" +#~ "Débarque tous les joueurs, en particulier ceux déconnectés, de tous les " +#~ "trains. À n'utiliser que quand aucun joueur sérieux n'a embarqué." + +#~ msgid "Detailed Steam Engine" +#~ msgstr "Locomotive à vapeur complexe" + +#~ msgid "Detector Rail" +#~ msgstr "Voie détectrice" + +#~ msgid "Diagonal Diamond Crossing Track" +#~ msgstr "Croisement diagonal" + +#~ msgid "Digiline channel" +#~ msgstr "Canal Digiline" + +#~ msgid "Disable the advtrains globalstep temporarily" +#~ msgstr "Désactive temporairement le pas global d'advtrains" + +#~ msgid "Disabled advtrains successfully" +#~ msgstr "Succès de la désactivation d'advtrains" + +#~ msgid "Door Delay" +#~ msgstr "Durée d'ouverture des portes" + +#~ msgid "Door Side" +#~ msgstr "Ouv. des portes coté" + +#~ msgid "Doors are closed! (Try holding sneak key!)" +#~ msgstr "Portes closes : (Essayez la \"sneak key\"!\")" + +#~ msgid "" +#~ "Doors are closed. Use Sneak+rightclick to ignore the closed doors and get " +#~ "off." +#~ msgstr "" +#~ "Portes closes ! Utilisez \"Marcher lentement (Sneak)\" et Clic-Droit pour " +#~ "franchir les portes et débarquer." + +#~ msgid "Driver Stand" +#~ msgstr "Poste de pilotage" + +#~ msgid "Driver Stand (left)" +#~ msgstr "Poste de pilotage (gauche)" + +#~ msgid "Driver Stand (right)" +#~ msgstr "Poste de pilotage (droit)" + +#~ msgid "Driver stand" +#~ msgstr "Poste de pilotage" + +#~ msgid "Driver's cab" +#~ msgstr "Cabine de pilotage" + +#~ msgid "Freight Code:" +#~ msgstr "Code de frêt :" + +#~ msgid "Get off" +#~ msgstr "Débarquer" + +#~ msgid "Get off (forced)" +#~ msgstr "Débarquer (de force)" + +#~ msgid "Industrial Train Engine" +#~ msgstr "Locomotive industrielle" + +#~ msgid "Industrial tank wagon" +#~ msgstr "Wagon-citerne industriel" + +#~ msgid "Industrial wood wagon" +#~ msgstr "Wagon grumier industriel" + +#~ msgid "Instructed to save() but load() was never called!" +#~ msgstr "Appel de save() requis sans appel préalable de load() !" + +#~ msgid "Japanese Train Engine" +#~ msgstr "Motrice Japonaise" + +#~ msgid "Japanese Train Inter-Wagon Connection" +#~ msgstr "Passage inter-voiture de train Japonais" + +#~ msgid "Japanese Train Wagon" +#~ msgstr "Voiture Japonaise" + +#~ msgid "Japanese signal pole" +#~ msgstr "Voiture Japonaise" + +#~ msgid "Kick out passengers" +#~ msgstr "Éjecter les passagers" + +#~ msgid "Lampless Signal" +#~ msgstr "Sémaphore" + +#~ msgid "Left" +#~ msgstr "Gauche" + +#~ msgid "Left,Right,Closed;" +#~ msgstr "Gauche,Droit,Fermé;" + +#~ msgid "Line" +#~ msgstr "Ligne" + +#~ msgid "Liquid: " +#~ msgstr "Liquide : " + +#~ msgid "Liquid: empty" +#~ msgstr "Liquide : vide" + +#~ msgid "Loading Track" +#~ msgstr "Voie de Chargement" + +#~ msgid "Lock couples" +#~ msgstr "Verrouiller l'accouplement" + +#~ msgid "LuaATC Environment" +#~ msgstr "Environnement LuaATC" + +#~ msgid "LuaATC Mesecon Controller" +#~ msgstr "Commande Mesecon de LuaATC" + +#~ msgid "LuaATC Operation Panel" +#~ msgstr "Panneau de commande de LuaATC" + +#~ msgid "LuaATC component assigned to an invalid environment" +#~ msgstr "Composant LuaATC assigné à un environnement invalide" + +#~ msgid "LuaATC component assigned to environment '@1'" +#~ msgstr "Composant LuaATC assigné à l'environnement '@1'" + +#~ msgid "LuaATC component with error: @1" +#~ msgstr "Erreur @1 du composant LuaATC" + +#~ msgid "Missing train_operator privilege" +#~ msgstr "Privilège \"train_operator\" manquant" + +#~ msgid "Munich U-Bahn Main Signal (" +#~ msgstr "Signal principal métro de Munich (" + +#~ msgid "Next FC:" +#~ msgstr "Code de fret suivant :" + +#~ msgid "Next Stop:\n" +#~ msgstr "Prochain arrêt :\n" + +#~ msgid "No callback to handle schedule" +#~ msgstr "Absence de fonction de gestion de planning" + +#~ msgid "No such lua entity." +#~ msgstr "Pas de telle entité lua." + +#~ msgid "No such train: @1." +#~ msgstr "Pas de tel train : @1." + +#~ msgid "No such wagon: @1." +#~ msgstr "Pas de tel wagon : @1." + +#~ msgid "Not a valid wagon id." +#~ msgstr "Identificateur de wagon invalide." + +#~ msgid "Not allowed to do this." +#~ msgstr "Vous n'êtes pas autorisé effectuer ceci." + +#~ msgid "" +#~ "OVERRUN RED SIGNAL! Examine situation and reverse train to move again." +#~ msgstr "" +#~ "Franchissement de signal rouge : examinez la situation et inversez le " +#~ "sens de marche du train." + +#~ msgid "Onboard Computer" +#~ msgstr "Ordinateur embarqué" + +#~ msgid "Passenger Wagon" +#~ msgstr "Voiture passager" + +#~ msgid "Passenger area" +#~ msgstr "Voiture Passager" + +#~ msgid "" +#~ "Passive Component Naming Tool\n" +#~ "\n" +#~ "Right-click to name a passive component." +#~ msgstr "" +#~ "Outil de nommage de composant passif\n" +#~ "\n" +#~ "Clic-Droit pour nommer un composant passif." + +#~ msgid "Perpendicular Diamond Crossing Track" +#~ msgstr "Croisement perpendiculaire" + +#~ msgid "Please specify a player name to transfer ownership to." +#~ msgstr "" +#~ "Spécifiez le nom du joueur à qui la propriété doit être transférée, SVP." + +#~ msgid "Position is occupied by a train." +#~ msgstr "Cet emplacement est occupé par un train." + +#~ msgid "Prev FC" +#~ msgstr "Code de fret précédent" + +#~ msgid "Print advtrains status info" +#~ msgstr "Affiche les informations d'état d'advtrains" + +#~ msgid "Re-enabling advtrains globalstep..." +#~ msgstr "Réacivation du pas global d'advtrains..." + +#~ msgid "Reduced speed" +#~ msgstr "Vitesse réduite" + +#~ msgid "Reload successful!" +#~ msgstr "Succès du rechargement !" + +#~ msgid "Removing unused wagon" +#~ msgstr "Suppression d'un wagon inutilisé" + +#~ msgid "Restoring saved state in 1 second..." +#~ msgstr "Restauration du l'état sauvegardé dans une seconde..." + +#~ msgid "Restricted speed" +#~ msgstr "Vitesse limitée" + +#~ msgid "Returns the position of the train with the given id" +#~ msgstr "Affiche la position du train identifié" + +#~ msgid "Right" +#~ msgstr "Droit" + +#~ msgid "Routingcode" +#~ msgstr "Code de routage" + +#~ msgid "Save" +#~ msgstr "Sauvegarder" + +#~ msgid "Save wagon properties" +#~ msgstr "Sauvegarder les propriétés du wagon" + +#~ msgid "Saving failed: " +#~ msgstr "Échec de sauvegarde : " + +#~ msgid "Scharfenberg Coupler" +#~ msgstr "Attelage Scharfenberg" + +#~ msgid "Select seat:" +#~ msgstr "Choisir le siège :" + +#~ msgid "Set name of component (empty to clear)" +#~ msgstr "Nommer le composant (chaîne vide pour effacer)" + +#~ msgid "Show Inventory" +#~ msgstr "Montrer le stock" + +#~ msgid "Speed:" +#~ msgstr "Vitesse : " + +#~ msgid "Station Code" +#~ msgstr "Code de Station" + +#~ msgid "Station code \"@1\" already exists and is owned by @2." +#~ msgstr "Le code de station \"@1\" existe et est possédé par @2." + +#~ msgid "Station/Stop Track" +#~ msgstr "Voie d'arrêt en station" + +#~ msgid "Steam Engine" +#~ msgstr "Locomotive à vapeur" + +#~ msgid "Stop Time" +#~ msgstr "Durée d'arrêt" + +#~ msgid "Subway Passenger Wagon" +#~ msgstr "Voiture de Métropolitain" + +#~ msgid "Target:" +#~ msgstr "Destination : " + +#~ msgid "Teleporting to train " +#~ msgstr "Téléportation au train " + +#~ msgid "Teleports you to the position of the train with the given id" +#~ msgstr "Vous téléporte à la position du train identifié" + +#~ msgid "Text displayed inside train" +#~ msgstr "Texte affiché à l'intérieur du train" + +#~ msgid "Text displayed outside on train" +#~ msgstr "Texte affiché à l'extérieur du train" + +#~ msgid "That player does not exist!" +#~ msgstr "Ce joueur n'existe pas !" + +#~ msgid "That wagon does not exist!" +#~ msgstr "Ce wagon n'a pas de siège !" + +#~ msgid "" +#~ "The advtrains globalstep has been disabled. Trains are not moving, and no " +#~ "data is saved! Run '/at_disable_step no' to enable again!" +#~ msgstr "" +#~ "Le pas global d'advtrains est désactivé. Les trains sont immobiles et " +#~ "aucune donnée n'est sauvegardée. Exécutez '/at_disable_step no ' pour le " +#~ "réactiver !" + +#~ msgid "The clipboard couldn't access the metadata. Copy failed." +#~ msgstr "" +#~ "Le presse-papier ne peut accéder aux métadonnées. Échec de la copie." + +#~ msgid "The clipboard couldn't access the metadata. Paste failed." +#~ msgstr "Le presse-papier ne peut accéder aux métadonnées. Échec du collage." + +#~ msgid "The clipboard is empty." +#~ msgstr "Le presse-papier est vide." + +#~ msgid "The track you are trying to place the wagon on is not long enough!" +#~ msgstr "" +#~ "La voie sur laquelle vous tentez de placer le wagon est trop courte !" + +#~ msgid "The track you are trying to place the wagon on is not long enough." +#~ msgstr "" +#~ "La voie sur laquelle vous tentez de placer le wagon est trop courte." + +#~ msgid "The wagon's inventory is not empty." +#~ msgstr "Le stock de ce wagon n'est pas vide." + +#~ msgid "There's a Signal Influence Point here." +#~ msgstr "Il y a un \"Signal Influence Point\" ici." + +#~ msgid "This Wagon ID" +#~ msgstr "Identificateur du wagon" + +#~ msgid "This node can't be changed using the trackworker!" +#~ msgstr "Ce nœud ne peut être modifié avec l'outil \"Trackworker\" !" + +#~ msgid "This node can't be rotated using the trackworker!" +#~ msgstr "Ce nœud ne peut être tourné avec l'outil \"Trackworker\" !" + +#, fuzzy +#~ msgid "This node can't be rotated using the trackworker," +#~ msgstr "Ce nœud ne peut être tourné avec l'outil \"Trackworker\" !" + +#~ msgid "This position is protected!" +#~ msgstr "Cet emplacement est protégé !" + +#~ msgid "This station is owned by @1. You are not allowed to edit its name." +#~ msgstr "" +#~ "Cette station est la propriété de @1. Vous n'êtes pas autorisé à modifier " +#~ "son nom." + +#~ msgid "This track can not be changed." +#~ msgstr "Cette voie ne peut pas être modifiée." + +#~ msgid "This track can not be removed!" +#~ msgstr "Cette voie ne peut pas être enlevée !" + +#~ msgid "This track can not be rotated!" +#~ msgstr "Cette voie ne peut pas être tournée !" + +#~ msgid "This wagon has no seats." +#~ msgstr "Ce wagon n'a pas de siège." + +#~ msgid "This wagon is full." +#~ msgstr "Ce wagon est plein." + +#~ msgid "This wagon is owned by @1, you can't destroy it." +#~ msgstr "Ce wagon est la propriété de @1, vous ne pouvez pas le détruire." + +#~ msgid "Track" +#~ msgstr "Voie" + +#~ msgid "" +#~ "Track Worker Tool\n" +#~ "\n" +#~ "Left-click: change rail type (straight/curve/switch)\n" +#~ "Right-click: rotate object" +#~ msgstr "" +#~ "Outil \"Trackworker\"\n" +#~ "\n" +#~ "Clic-Gauche : change le type de rail (droit/courbé/aiguillage)\n" +#~ "\n" +#~ "Clic-Droit : tourne l'objet" + +#~ msgid "Train" +#~ msgstr "Identificateur du train" + +#~ msgid "Train " +#~ msgstr "Identificateur du train " + +#~ msgid "Train ID" +#~ msgstr "Identificateur du train" + +#~ msgid "Train copied." +#~ msgstr "Train copié." + +#~ msgid "" +#~ "Train copy/paste tool\n" +#~ "\n" +#~ "Left-click: copy train\n" +#~ "Right-click: paste train" +#~ msgstr "" +#~ "Outil de copie/collage de train\n" +#~ "\n" +#~ "Clic-Gauche : copie\n" +#~ "\n" +#~ "Clic-Droit : collage" + +#~ msgid "" +#~ "Train overview / coupling control is only shown when the train stands." +#~ msgstr "" +#~ "Aperçu du train / commande d'accouplement montré uniquement à l'arrêt du " +#~ "train." + +#~ msgid "Train overview /coupling control:" +#~ msgstr "Aperçu du train / commande d'accouplement :" + +#~ msgid "Trains stopping here (ARS rules)" +#~ msgstr "Trains marquant l'arrêt (règles ARS)" + +#~ msgid "Unable to load wagon type" +#~ msgstr "Impossible de charger le type du wagon" + +#~ msgid "Unconfigured ATC controller" +#~ msgstr "Controlleur ATC, non-configuré" + +#~ msgid "Unconfigured LuaATC component" +#~ msgstr "Composant LuaATC non configuré" + +#~ msgid "Uninitialized init=" +#~ msgstr "Variable init non initialisée" + +#~ msgid "Uninitialized, removing" +#~ msgstr "Non initialisé, retiré" + +#~ msgid "Unknown Station" +#~ msgstr "Gare inconnue" + +#~ msgid "Unloading Track" +#~ msgstr "Voie de Déchargement" + +#~ msgid "Use Sneak+rightclick to bypass closed doors!" +#~ msgstr "" +#~ "Utilisez \"Marcher lentement (Sneak)\" et Clic-Droit pour franchir les " +#~ "portes closes !" + +#~ msgid "Wagon @1 ownership changed from @2 to @3" +#~ msgstr "La propriété du wagon @1 a été transférée de @2 à @3" + +#~ msgid "Wagon Properties Tool" +#~ msgstr "Outil de propriété du wagon" + +#~ msgid "" +#~ "Wagon Properties Tool\n" +#~ "Punch a wagon to view and edit the Wagon Properties" +#~ msgstr "" +#~ "Outil de propriété du wagon\n" +#~ "Frappez un wagon pour voir et modifier ses propriétés" + +#~ msgid "" +#~ "Wagon needs to be decoupled from other wagons in order to destroy it." +#~ msgstr "" +#~ "Les wagons doivent être désaccouplés des autres pour pouvoir être " +#~ "détruits." + +#~ msgid "Wagon properties" +#~ msgstr "Propriétés du wagon" + +#~ msgid "Wagon road number:" +#~ msgstr "Immatriculation du wagon :" + +#~ msgid "Wait for signal to clear" +#~ msgstr "En attente de signal d'autorisation" + +#~ msgid "Wallmounted Signal (left)" +#~ msgstr "Signal mural (gauche)" + +#~ msgid "Wallmounted Signal (right)" +#~ msgstr "Signal mural (droit)" + +#~ msgid "Wallmounted Signal (top)" +#~ msgstr "Signal mural (plafond)" + +#~ msgid "" +#~ "Warning: If you destroy this wagon, you only get some steel back! If you " +#~ "are sure, hold Sneak and left-click the wagon." +#~ msgstr "" +#~ "Attention: Si vous détruisez ce wagon, vous ne récupérerez que de la " +#~ "ferraille ! Si vous êtes sûr de vous, appuyez la touche \"Marcher " +#~ "lentement (Sneak)\" et Clic-Gauche." + +#~ msgid "Wheel" +#~ msgstr "Roue" + +#~ msgid "Y-turnout" +#~ msgstr "Embranchement en Y" + +#~ msgid "You are not allowed to access the driver stand." +#~ msgstr "Accès interdit au poste de pilotage." + +#~ msgid "You are not allowed to build near tracks at this protected position." +#~ msgstr "" +#~ "Vous ne pouvez pas construire à proximité d'une voie à cet emplacement " +#~ "protégé." + +#~ msgid "" +#~ "You are not allowed to build near tracks without the track_builder " +#~ "privilege." +#~ msgstr "" +#~ "Vous ne pouvez pas construire à proximité d'une voie sans le privilège " +#~ "\"track_builder\" (?)" + +#~ msgid "You are not allowed to build tracks at this protected position." +#~ msgstr "Vous ne pouvez pas construire une voie à cet emplacement protégé." + +#~ msgid "" +#~ "You are not allowed to build tracks without the track_builder privilege." +#~ msgstr "" +#~ "Vous ne pouvez pas construire une voie sans le privilège " +#~ "\"track_builder\"." + +#~ msgid "" +#~ "You are not allowed to configure this LuaATC component without the @1 " +#~ "privilege." +#~ msgstr "Vous ne pouvez configurer ce composant LuaATC sans le privilege @1." + +#~ msgid "" +#~ "You are not allowed to couple trains without the train_operator privilege." +#~ msgstr "" +#~ "Vous n'êtes pas autorisé à coupler des trains sans le privilège " +#~ "\"train_operator\"." + +#, fuzzy +#~ msgid "You are not allowed to modify this protected track." +#~ msgstr "Vous ne pouvez pas construire une voie à cet emplacement protégé" + +#~ msgid "" +#~ "You are not allowed to name LuaATC passive components without the @1 " +#~ "privilege." +#~ msgstr "" +#~ "Vous ne pouvez nommer un composant LuaATC passif sans le privilege @1." + +#~ msgid "" +#~ "You are not allowed to operate turnouts and signals without the " +#~ "railway_operator privilege." +#~ msgstr "" +#~ "Vous ne pouvez pas actionner les aiguillages ou les signaux (privilège " +#~ "\"railway_operator\" manquant)" + +#~ msgid "You can't get on this wagon." +#~ msgstr "Montée impossible dans ce wagon." + +#~ msgid "You do not have the @1 privilege." +#~ msgstr "Vous ne possédez pas le privilège \"@1\"." + +#~ msgid "You don't have the train_operator privilege." +#~ msgstr "Vous ne possédez pas le privilège \"train_operator\"." + +#~ msgid "You have been given ownership of wagon @1" +#~ msgstr "La propriété du wagon @1 vous a été transférée" + +#~ msgid "" +#~ "You need to own at least one neighboring wagon to destroy this couple." +#~ msgstr "" +#~ "Vous devez être propriétaire d'au moins un wagon voisin pour supprimer " +#~ "cet attelage." + +#~ msgid "from wagon_save table." +#~ msgstr "de la table wagon_save." + +#~ msgid "" +#~ "had no wagons left because of some bug. It is being deleted. Wave it " +#~ "goodbye!" +#~ msgstr "" +#~ "n'a plus de wagon à cause d'un bug quelconque. Il est détruit. Faites lui " +#~ "coucou !" + +#~ msgid "slowdown" +#~ msgstr "ralentissement" diff --git a/advtrains_interlocking/po/update-translations.sh b/advtrains_interlocking/po/update-translations.sh new file mode 100644 index 0000000..5c42e7b --- /dev/null +++ b/advtrains_interlocking/po/update-translations.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +MODNAME="advtrains_interlocking" +MSGID_BUGS_ADDR='advtrains-discuss@lists.sr.ht' + +PODIR=`dirname "$0"` +ATDIR="$PODIR/.." +POTFILE="$PODIR/$MODNAME.pot" + +xgettext \ + -D "$ATDIR" \ + -d "$MODNAME" \ + -o "$POTFILE" \ + -p . \ + -L lua \ + --add-location=file \ + --from-code=UTF-8 \ + --sort-by-file \ + --keyword='S' \ + --package-name="$MODNAME" \ + --msgid-bugs-address="$MSGID_BUGS_ADDR" \ + `find $ATDIR $BTDIR -name '*.lua' -printf '%P\n'` \ + && +for i in "$PODIR"/*.po; do + msgmerge -U \ + --sort-by-file \ + $i "$POTFILE" +done diff --git a/advtrains_interlocking/po/zh_CN.po b/advtrains_interlocking/po/zh_CN.po new file mode 100644 index 0000000..48c5805 --- /dev/null +++ b/advtrains_interlocking/po/zh_CN.po @@ -0,0 +1,1278 @@ +msgid "" +msgstr "" +"Project-Id-Version: advtrains\n" +"Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n" +"POT-Creation-Date: 2025-06-11 23:21+0200\n" +"PO-Revision-Date: 2023-10-09 11:24+0200\n" +"Last-Translator: Y. Wang <yw05@forksworld.de>\n" +"Language-Team: Chinese (Simplified)\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.3.2\n" + +#: autonaming.lua +msgid "Prefix set, next signal name will be: @1" +msgstr "" + +#: autonaming.lua +msgid "Prefix unset, signals are not auto-named for you!" +msgstr "" + +#: autonaming.lua +msgid "" +"Sets the current prefix for automatically naming interlocking components. " +"Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on" +msgstr "" + +#: database.lua +msgid "Created track section @1 from @2 TCBs" +msgstr "" + +#: database.lua +msgid "Track section inconsistent here, repairing..." +msgstr "" + +#: database.lua +msgid "Track section partition found, repairing..." +msgstr "" + +#: init.lua +msgid "Can set up track sections, routes and signals" +msgstr "" + +#: route_prog.lua +msgid "@1 Terminal @2" +msgstr "" + +#: route_prog.lua +msgid "@1 is held in @2 position when this route is set and freed " +msgstr "" + +#: route_prog.lua +msgid "@1 is no longer affected when this route is set." +msgstr "" + +#: route_prog.lua +msgid "Added track section @1 to the route." +msgstr "" + +#: route_prog.lua +msgid "Advance to next route section" +msgstr "" + +#: route_prog.lua +msgid "Advance/Complete Route" +msgstr "" + +#: route_prog.lua +msgid "Advancing over next section is" +msgstr "" + +#: route_prog.lua +msgid "Cancel if you are unsure!" +msgstr "" + +#: route_prog.lua +msgid "Cancel route programming" +msgstr "" + +#: route_prog.lua +msgid "Cannot program route without a target" +msgstr "" + +#: route_prog.lua tcb_ts_ui.lua +msgid "End of interlocking" +msgstr "" + +#: route_prog.lua +msgid "Enter Route Name" +msgstr "" + +#: route_prog.lua +msgid "Finish programming route" +msgstr "" + +#: route_prog.lua +msgid "Finish route HERE" +msgstr "" + +#: route_prog.lua +msgid "Finish route at end of NEXT section" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 (punch to unfix)" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 until segment #@3 is freed." +msgstr "" + +#: route_prog.lua route_ui.lua signal_aspect_ui.lua tcb_ts_ui.lua tool.lua +msgid "Insufficient privileges to use this!" +msgstr "" + +#: route_prog.lua +msgid "Next section is diverging (>2 TCBs)" +msgstr "" + +#: route_prog.lua +msgid "Route discarded." +msgstr "" + +#: route_prog.lua +msgid "Route ends at signal:" +msgstr "" + +#: route_prog.lua +msgid "Route leads into" +msgstr "" + +#: route_prog.lua +msgid "" +"Route programming mode active. Punch TCBs to add route segments, punch " +"turnouts to lock them." +msgstr "" + +#: route_prog.lua +msgid "Route section @1 removed." +msgstr "" + +#: route_prog.lua +msgid "Routes should in most cases end at signals." +msgstr "" + +#: route_prog.lua +msgid "Save Route" +msgstr "" + +#: route_prog.lua +msgid "Step back one section" +msgstr "" + +#: route_prog.lua +msgid "Successfully programmed route." +msgstr "" + +#: route_prog.lua +msgid "The origin TCB has become unknown during programming. Try again." +msgstr "" + +#: route_prog.lua +msgid "This TCB is not suitable as" +msgstr "" + +#: route_prog.lua +msgid "This TCB is unconfigured, you first need to assign it to a rail" +msgstr "" + +#: route_prog.lua +msgid "WARNING: Route does not end at a signal." +msgstr "" + +#: route_prog.lua +msgid "[Route programming] " +msgstr "" + +#: route_prog.lua +msgid "impossible at this place." +msgstr "" + +#: route_prog.lua +msgid "non-interlocked area" +msgstr "" + +#: route_prog.lua +msgid "route continuation." +msgstr "" + +#: route_ui.lua +msgid "<< Select a route part to edit options" +msgstr "" + +#: route_ui.lua +#, fuzzy +msgid "<Default Aspect>" +msgstr "默认座位" + +#: route_ui.lua +msgid "ARS Rule List" +msgstr "" + +#: route_ui.lua +msgid "Announce distant signal" +msgstr "" + +#: route_ui.lua +msgid "Back to signal" +msgstr "" + +#: route_ui.lua +msgid "Call-on (section may be occupied)" +msgstr "" + +#: route_ui.lua +msgid "Clone Route" +msgstr "" + +#: route_ui.lua +msgid "Delete Route" +msgstr "" + +#: route_ui.lua +msgid "Error:" +msgstr "" + +#: route_ui.lua +msgid "New From Route" +msgstr "" + +#: route_ui.lua +msgid "No Signal at this TCB" +msgstr "" + +#: route_ui.lua +msgid "Route name" +msgstr "" + +#: route_ui.lua +msgid "Route overview" +msgstr "" + +#: route_ui.lua +msgid "Save ARS List" +msgstr "" + +#: route_ui.lua +msgid "Section Options:" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Set" +msgstr "" + +#: route_ui.lua signal_aspect_ui.lua +#, fuzzy +msgid "Signal Aspect:" +msgstr "信号灯" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 has different section than previous TCB" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is not assigned to previous track section" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Track section after @1 missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Turnout/component missing at @1" +msgstr "" + +#: routesetting.lua +msgid "Lock conflict at @1, Held locked by:" +msgstr "" + +#: routesetting.lua +msgid "No TCB found at @1. Please update or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "No track section adjacent to @1. Please reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2, segment #@3" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' already has route set from @2:" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' is occupied!" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' not found!" +msgstr "" + +#: routesetting.lua +msgid "" +"TCB at @1 has different section than previous TCB. Please update track " +"section or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "" +"Turnout/component missing at @1. Please update track section or reconfigure " +"route!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<assign distant>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<none>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned distant signal to the main signal at @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned signal to the TCB at @1" +msgstr "" + +#: signal_aspect_ui.lua tool.lua +msgid "Clear" +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Influence point of another signal is already present!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Node is too far away. Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Please look in train's driving direction and punch rail " +"to set influence point." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Successfully set influence point" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Dst: @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is not set." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is set at @1." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Modify" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set distant signal: Punch the main signal to assign!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set influence point" +msgstr "" + +#: smartroute.lua +msgid "Apply" +msgstr "" + +#: smartroute.lua +msgid "Route search: @1 found" +msgstr "" + +#: smartroute.lua +msgid "Search further" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: No track section directly ahead!" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: TCBS or routes don't exist here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid " (invalid)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "@1 locks in state @2" +msgstr "" + +#: tcb_ts_ui.lua +msgid "A route is requested from this signal:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Add locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Assign a signal" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic Working is active." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic routesetting" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Boundary TCBs:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove TCB: Both sides must have no signal assigned!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove track, a train is here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Cannot delete route which has ARS rules, please review and then delete " +"through edit dialog!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Clear locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Configuring TCB: Already existed at this position, it is now linked to this " +"TCB marker" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Cannot use static signals for routesetting. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Internal error, TCBS doesn't exist. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Node is too far away. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Not a compatible signal. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the rail you want to assign this TCB to." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the signal to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully assigned signal." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully configured TCB" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Create Interlocked Track Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Delete this route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Disable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Distant signal triggers ARS" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Edit" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Enable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Error: TS modified, abort!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Final TCBS unset (legacy-style buffer route)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Fixed route locks (e.g. level crossings):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link: @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Multiple routes are requested (first available is set):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "NOTE: ARS is disabled." +msgstr "" + +#: tcb_ts_ui.lua +msgid "New (Manual)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No Link" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No routes are yet defined." +msgstr "" + +#: tcb_ts_ui.lua +msgid "No trains on this section." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Punch components to add fixed locks. (punch anything else = end)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Remove Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Reset section state" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Reset track section" +msgstr "改变行车方向" + +#: tcb_ts_ui.lua +msgid "Reset track section @1!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route has been set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is re-set when a train passed." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set over this signal by:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set: " +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes are not automatically set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Section holds @1 route locks." +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Section name" +msgstr "车站名称" + +#: tcb_ts_ui.lua +msgid "Set ARS default route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Set Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Setting fixed locks finished!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show track section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Side @1" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signal at @1" +msgstr "信号灯" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signal name" +msgstr "信号灯" + +#: tcb_ts_ui.lua +msgid "Signal on B side already assigned!" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signalling" +msgstr "信号灯" + +#: tcb_ts_ui.lua +msgid "Smart Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB Link: Select linked TCB now!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB already existed at this position, now linked to this node" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB assigned to @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "This TCB has been removed. Please dig marker." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is a pure distant signal\n" +"No route is currently set through." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is an always-halt signal (e.g. a buffer)\n" +"No routes can be set from here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will clear the list of trains\n" +"and the routesetting status of this section.\n" +"Are you sure?" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will remove the track section and set all its end points to End Of " +"Interlocking" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break Configuration" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Section Detail - @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Trains on this section:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Unconfigured Track Circuit Break, right-click to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Wait for this route to be cancelled in order to do anything here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Waiting for route to be set..." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Yes" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"You cannot modify track sections when a route is set or a train is on the " +"section." +msgstr "" + +#: tool.lua +msgid "Emplace manual lock" +msgstr "" + +#: tool.lua +msgid "" +"Interlocking tool\n" +"Punch: Highlight track section\n" +"Place: check route locks/show track section info" +msgstr "" + +#: tool.lua +msgid "No route locks set" +msgstr "" + +#: tool.lua +msgid "No track section at this location!" +msgstr "" + +#: tool.lua +msgid "Node is not a track!" +msgstr "" + +#: tool.lua +msgid "Route lock inspector" +msgstr "" + +#: tool.lua +msgid "Route locks currently put:" +msgstr "" + +#: tsr_rail.lua +msgid "Point Speed Restriction Track" +msgstr "" + +#: tsr_rail.lua +msgid "Point speed restriction: @1" +msgstr "" + +#: tsr_rail.lua +msgid "Set point speed restriction:" +msgstr "" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track without the @1 privilege." +msgstr "您没有“@1”权限，不能调整这段轨道。" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track." +msgstr "您不能调整这段轨道。" + +#~ msgid "(Doors closed)" +#~ msgstr "(车门已关闭)" + +#~ msgid "3-way turnout" +#~ msgstr "三开道岔" + +#~ msgid "90+Angle Diamond Crossing Track" +#~ msgstr "交叉轨道 (其中一条轨道与坐标轴平行)" + +#~ msgid "<No coupler>" +#~ msgstr "<没有车钩>" + +#~ msgid "@1 Platform (45 degree)" +#~ msgstr "较高的@1站台 (45°)" + +#~ msgid "@1 Platform (high)" +#~ msgstr "较高的@1站台" + +#~ msgid "@1 Platform (low)" +#~ msgstr "较低的@1站台" + +#~ msgid "@1 Platform (low, 45 degree)" +#~ msgstr "较低的@1站台 (45°)" + +#~ msgid "@1 Slope" +#~ msgstr "@1斜坡" + +#~ msgid "ATC Kick command warning: doors are closed." +#~ msgstr "ATC 警告：车门已关闭，无法踢出乘客。" + +#~ msgid "ATC Kick command warning: train moving." +#~ msgstr "ATC 警告：火车正在移动，无法踢出乘客。" + +#~ msgid "ATC Reverse command warning: didn't reverse train, train moving." +#~ msgstr "ATC 警告：火车正在移动，无法改变行车方向。" + +#~ msgid "ATC command parse error: Unknown command: @1" +#~ msgstr "ATC 语法错误：未知命令：@1" + +#~ msgid "ATC command syntax error: I statement not closed: @1" +#~ msgstr "ATC 语法错误：“I”命令不完整：@1" + +#~ msgid "ATC controller" +#~ msgstr "ATC 控制器" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Channel: @2" +#~ msgstr "" +#~ "ATC 控制器\n" +#~ "模式：@1\n" +#~ "频道：@2" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Command: @2" +#~ msgstr "" +#~ "ATC 控制器\n" +#~ "模式：@1\n" +#~ "命令：@2" + +#~ msgid "Access to @1" +#~ msgstr "可前往@1" + +#~ msgid "Andrew's Cross" +#~ msgstr "铁路道口信号灯" + +#~ msgid "Back of train would end up off track, cancelling." +#~ msgstr "火车后部不在轨道上。" + +#~ msgid "Big Industrial Train Engine" +#~ msgstr "大型工业用火车头" + +#~ msgid "Boiler" +#~ msgstr "锅炉" + +#~ msgid "Box Wagon" +#~ msgstr "货运车厢" + +#~ msgid "Buffer and Chain Coupler" +#~ msgstr "链式车钩" + +#~ msgid "Bumper" +#~ msgstr "保险杠" + +#~ msgid "Can not couple: The couplers of the trains do not match (@1 and @2)." +#~ msgstr "您无法连接这两节车厢：这两节车厢使用不同的车钩 (@1和@2)。" + +#~ msgid "Can't get on: wagon full or doors closed!" +#~ msgstr "无法上车：车门已关闭或车厢已满。" + +#, fuzzy +#~ msgid "Can't place: Not enough slope items left (@1 required)" +#~ msgstr "无法放置斜坡：您没有足够的铁路斜坡放置工具 (您总共需要@1个)" + +#, fuzzy +#~ msgid "Can't place: There's no slope of length @1" +#~ msgstr "无法放置斜坡：advtrains 不支持长度为@1米的斜坡。" + +#, fuzzy +#~ msgid "Can't place: no supporting node at upper end." +#~ msgstr "无法放置斜坡：较高端没有支撑方块。" + +#, fuzzy +#~ msgid "Can't place: not pointing at node" +#~ msgstr "无法放置斜坡：您没有选择任何方块。" + +#~ msgid "Can't place: protected position!" +#~ msgstr "无法放置：此区域已被保护。" + +#, fuzzy +#~ msgid "Can't place: space occupied!" +#~ msgstr "无法放置斜坡：此区域已被占用。" + +#~ msgid "Chimney" +#~ msgstr "烟囱" + +#~ msgid "Command" +#~ msgstr "命令" + +#~ msgid "Command (on)" +#~ msgstr "命令 (激活时)" + +#~ msgid "Default Seat (driver stand)" +#~ msgstr "默认座位 (司机座位)" + +#~ msgid "Dep. Speed" +#~ msgstr "出发速度" + +#~ msgid "Deprecated Track" +#~ msgstr "请不要使用" + +#~ msgid "Detailed Steam Engine" +#~ msgstr "精细的蒸汽机车" + +#~ msgid "Detector Rail" +#~ msgstr "探测轨道" + +#~ msgid "Diagonal Diamond Crossing Track" +#~ msgstr "交叉轨道" + +#~ msgid "Digiline channel" +#~ msgstr "Digiline 频道" + +#~ msgid "Door Delay" +#~ msgstr "车门关闭时间" + +#~ msgid "" +#~ "Doors are closed. Use Sneak+rightclick to ignore the closed doors and get " +#~ "off." +#~ msgstr "车门已关闭，请使用潜行+右键单击下车。" + +#, fuzzy +#~ msgid "Driver Stand" +#~ msgstr "司机座位" + +#~ msgid "Driver Stand (left)" +#~ msgstr "左侧司机座位" + +#~ msgid "Driver Stand (right)" +#~ msgstr "右侧司机座位" + +#~ msgid "Driver stand" +#~ msgstr "司机座位" + +#~ msgid "Driver's cab" +#~ msgstr "驾驶室" + +#~ msgid "Get off" +#~ msgstr "下车" + +#~ msgid "Get off (forced)" +#~ msgstr "强制下车" + +#~ msgid "Industrial Train Engine" +#~ msgstr "工业用火车头" + +#~ msgid "Industrial tank wagon" +#~ msgstr "液体运输车厢" + +#~ msgid "Industrial wood wagon" +#~ msgstr "木材运输车厢" + +#~ msgid "Japanese Train Engine" +#~ msgstr "高速列车车头" + +#~ msgid "Japanese Train Inter-Wagon Connection" +#~ msgstr "日本火车车钩" + +#~ msgid "Japanese Train Wagon" +#~ msgstr "高速列车车厢" + +#, fuzzy +#~ msgid "Japanese signal pole" +#~ msgstr "高速列车车厢" + +#~ msgid "Kick out passengers" +#~ msgstr "踢出乘客" + +#~ msgid "Lampless Signal" +#~ msgstr "臂板信号机" + +#~ msgid "Line" +#~ msgstr "火车线路" + +#~ msgid "Loading Track" +#~ msgstr "装货轨道" + +#~ msgid "Lock couples" +#~ msgstr "锁定连接处" + +#~ msgid "No such lua entity." +#~ msgstr "您没有指向一个可以用火车复制工具复制的物体。" + +#~ msgid "No such train: @1." +#~ msgstr "ID 为“@1”的列车不存在。" + +#~ msgid "No such wagon: @1." +#~ msgstr "ID 为“@1”的车厢不存在。" + +#, fuzzy +#~ msgid "Not allowed to do this." +#~ msgstr "您不能调整这段轨道。" + +#~ msgid "Passenger Wagon" +#~ msgstr "客车" + +#, fuzzy +#~ msgid "Passenger area" +#~ msgstr "客车" + +#~ msgid "" +#~ "Passive Component Naming Tool\n" +#~ "\n" +#~ "Right-click to name a passive component." +#~ msgstr "" +#~ "被动元件命名工具\n" +#~ "\n" +#~ "右键单击命名所选元件。" + +#~ msgid "Perpendicular Diamond Crossing Track" +#~ msgstr "垂直交叉轨道" + +#~ msgid "Routingcode" +#~ msgstr "路由码" + +#~ msgid "Save" +#~ msgstr "保存" + +#~ msgid "Save wagon properties" +#~ msgstr "保存车厢属性" + +#~ msgid "Scharfenberg Coupler" +#~ msgstr "Scharfenberg 式车钩" + +#~ msgid "Select seat:" +#~ msgstr "请选择座位：" + +#~ msgid "Show Inventory" +#~ msgstr "显示物品栏" + +#~ msgid "Speed:" +#~ msgstr "速度" + +#~ msgid "Station Code" +#~ msgstr "车站代码" + +#~ msgid "Station/Stop Track" +#~ msgstr "车站轨道" + +#~ msgid "Steam Engine" +#~ msgstr "蒸汽机车" + +#~ msgid "Stop Time" +#~ msgstr "停站时间" + +#~ msgid "Subway Passenger Wagon" +#~ msgstr "地铁车厢" + +#~ msgid "Target:" +#~ msgstr "目标速度" + +#~ msgid "Text displayed inside train" +#~ msgstr "车厢内部显示" + +#~ msgid "Text displayed outside on train" +#~ msgstr "车厢外部显示" + +#, fuzzy +#~ msgid "That wagon does not exist!" +#~ msgstr "这节车厢没有座位。" + +#~ msgid "The clipboard couldn't access the metadata. Copy failed." +#~ msgstr "无法复制：剪贴板无法访问元数据。" + +#~ msgid "The clipboard couldn't access the metadata. Paste failed." +#~ msgstr "无法粘贴：剪贴板无法访问元数据。" + +#~ msgid "The clipboard is empty." +#~ msgstr "剪贴板是空的。" + +#, fuzzy +#~ msgid "The track you are trying to place the wagon on is not long enough!" +#~ msgstr "轨道太短。" + +#~ msgid "The track you are trying to place the wagon on is not long enough." +#~ msgstr "轨道太短。" + +#, fuzzy +#~ msgid "This Wagon ID" +#~ msgstr "车厢已满。" + +#, fuzzy +#~ msgid "This node can't be changed using the trackworker!" +#~ msgstr "您不能使用铁路调整工具调整这个方块。" + +#, fuzzy +#~ msgid "This node can't be rotated using the trackworker!" +#~ msgstr "您不能使用铁路调整工具旋转这个方块。" + +#, fuzzy +#~ msgid "This node can't be rotated using the trackworker," +#~ msgstr "您不能使用铁路调整工具旋转这个方块。" + +#~ msgid "This position is protected!" +#~ msgstr "这里已被保护。" + +#~ msgid "This track can not be changed." +#~ msgstr "您不能调整这段轨道。" + +#, fuzzy +#~ msgid "This track can not be removed!" +#~ msgstr "您不能移除这段轨道。" + +#, fuzzy +#~ msgid "This track can not be rotated!" +#~ msgstr "您不能旋转这段轨道。" + +#~ msgid "This wagon has no seats." +#~ msgstr "这节车厢没有座位。" + +#~ msgid "This wagon is full." +#~ msgstr "车厢已满。" + +#~ msgid "This wagon is owned by @1, you can't destroy it." +#~ msgstr "这是 @1 的车厢，您不能摧毁它。" + +#~ msgid "Track" +#~ msgstr "轨道" + +#~ msgid "" +#~ "Track Worker Tool\n" +#~ "\n" +#~ "Left-click: change rail type (straight/curve/switch)\n" +#~ "Right-click: rotate object" +#~ msgstr "" +#~ "铁路调整工具\n" +#~ "\n" +#~ "左键单击：切换轨道类型\n" +#~ "右键单击：旋转方块" + +#, fuzzy +#~ msgid "Train " +#~ msgstr "已复制列车。" + +#~ msgid "Train copied." +#~ msgstr "已复制列车。" + +#~ msgid "" +#~ "Train copy/paste tool\n" +#~ "\n" +#~ "Left-click: copy train\n" +#~ "Right-click: paste train" +#~ msgstr "" +#~ "火车复制工具\n" +#~ "\n" +#~ "左键单击：复制\n" +#~ "右键单击：粘帖" + +#~ msgid "Unconfigured ATC controller" +#~ msgstr "ATC 控制器 (未配置)" + +#~ msgid "Unconfigured LuaATC component" +#~ msgstr "LuaATC 部件 (未配置)" + +#~ msgid "Unloading Track" +#~ msgstr "卸货轨道" + +#~ msgid "Use Sneak+rightclick to bypass closed doors!" +#~ msgstr "请使用潜行+右键上车。" + +#, fuzzy +#~ msgid "Wagon Properties Tool" +#~ msgstr "车厢属性" + +#~ msgid "Wagon properties" +#~ msgstr "车厢属性" + +#~ msgid "Wallmounted Signal (left)" +#~ msgstr "壁挂式信号灯 (左侧)" + +#~ msgid "Wallmounted Signal (right)" +#~ msgstr "壁挂式信号灯 (右侧)" + +#~ msgid "Wallmounted Signal (top)" +#~ msgstr "悬挂式信号灯" + +#~ msgid "" +#~ "Warning: If you destroy this wagon, you only get some steel back! If you " +#~ "are sure, hold Sneak and left-click the wagon." +#~ msgstr "" +#~ "警告：如果您摧毁此车厢，您只能拿到一些钢方块。如果您确定要摧毁这节车厢，请" +#~ "按潜行键并左键单击此车厢。" + +#~ msgid "Wheel" +#~ msgstr "车轮" + +#~ msgid "Y-turnout" +#~ msgstr "对称道岔" + +#~ msgid "You are not allowed to build near tracks at this protected position." +#~ msgstr "这里已被保护，您不能在这里的铁路附近建任何东西。" + +#~ msgid "" +#~ "You are not allowed to build near tracks without the track_builder " +#~ "privilege." +#~ msgstr "您没有“train_operator”权限，不能在铁路附近建任何东西。" + +#~ msgid "You are not allowed to build tracks at this protected position." +#~ msgstr "这里已被保护，您不能在这里建造铁路。" + +#~ msgid "" +#~ "You are not allowed to build tracks without the track_builder privilege." +#~ msgstr "您没有“train_operator”权限，不能在这里建造铁路。" + +#~ msgid "" +#~ "You are not allowed to configure this LuaATC component without the @1 " +#~ "privilege." +#~ msgstr "您没有“@1”权限，不能配置这个 LuaATC 部件。" + +#~ msgid "" +#~ "You are not allowed to couple trains without the train_operator privilege." +#~ msgstr "您没有“train_operator”权限，不能连接这两节车厢。" + +#, fuzzy +#~ msgid "You are not allowed to modify this protected track." +#~ msgstr "这里已被保护，您不能在这里建造铁路。" + +#~ msgid "" +#~ "You are not allowed to name LuaATC passive components without the @1 " +#~ "privilege." +#~ msgstr "您没有“@1”权限，不能命名被动元件。" + +#~ msgid "" +#~ "You are not allowed to operate turnouts and signals without the " +#~ "railway_operator privilege." +#~ msgstr "您没有“railway_operator”权限，不能控制铁路设施。" + +#~ msgid "You do not have the @1 privilege." +#~ msgstr "您没有“@1”权限。" + +#, fuzzy +#~ msgid "You don't have the train_operator privilege." +#~ msgstr "您没有“@1”权限。" + +#~ msgid "" +#~ "You need to own at least one neighboring wagon to destroy this couple." +#~ msgstr "您必须至少拥有其中一节车厢才能分开这两节车厢。" diff --git a/advtrains_interlocking/po/zh_TW.po b/advtrains_interlocking/po/zh_TW.po new file mode 100644 index 0000000..6f07afb --- /dev/null +++ b/advtrains_interlocking/po/zh_TW.po @@ -0,0 +1,1278 @@ +msgid "" +msgstr "" +"Project-Id-Version: advtrains\n" +"Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n" +"POT-Creation-Date: 2025-06-11 23:21+0200\n" +"PO-Revision-Date: 2023-10-09 11:31+0200\n" +"Last-Translator: Y. Wang <yw05@forksworld.de>\n" +"Language-Team: Chinese (Traditional)\n" +"Language: zh_TW\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.3.2\n" + +#: autonaming.lua +msgid "Prefix set, next signal name will be: @1" +msgstr "" + +#: autonaming.lua +msgid "Prefix unset, signals are not auto-named for you!" +msgstr "" + +#: autonaming.lua +msgid "" +"Sets the current prefix for automatically naming interlocking components. " +"Example: '/at_nameprefix TEST' - signals will be named TEST1, TEST2 and so on" +msgstr "" + +#: database.lua +msgid "Created track section @1 from @2 TCBs" +msgstr "" + +#: database.lua +msgid "Track section inconsistent here, repairing..." +msgstr "" + +#: database.lua +msgid "Track section partition found, repairing..." +msgstr "" + +#: init.lua +msgid "Can set up track sections, routes and signals" +msgstr "" + +#: route_prog.lua +msgid "@1 Terminal @2" +msgstr "" + +#: route_prog.lua +msgid "@1 is held in @2 position when this route is set and freed " +msgstr "" + +#: route_prog.lua +msgid "@1 is no longer affected when this route is set." +msgstr "" + +#: route_prog.lua +msgid "Added track section @1 to the route." +msgstr "" + +#: route_prog.lua +msgid "Advance to next route section" +msgstr "" + +#: route_prog.lua +msgid "Advance/Complete Route" +msgstr "" + +#: route_prog.lua +msgid "Advancing over next section is" +msgstr "" + +#: route_prog.lua +msgid "Cancel if you are unsure!" +msgstr "" + +#: route_prog.lua +msgid "Cancel route programming" +msgstr "" + +#: route_prog.lua +msgid "Cannot program route without a target" +msgstr "" + +#: route_prog.lua tcb_ts_ui.lua +msgid "End of interlocking" +msgstr "" + +#: route_prog.lua +msgid "Enter Route Name" +msgstr "" + +#: route_prog.lua +msgid "Finish programming route" +msgstr "" + +#: route_prog.lua +msgid "Finish route HERE" +msgstr "" + +#: route_prog.lua +msgid "Finish route at end of NEXT section" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 (punch to unfix)" +msgstr "" + +#: route_prog.lua +msgid "Fixed in state @1 by route @2 until segment #@3 is freed." +msgstr "" + +#: route_prog.lua route_ui.lua signal_aspect_ui.lua tcb_ts_ui.lua tool.lua +msgid "Insufficient privileges to use this!" +msgstr "" + +#: route_prog.lua +msgid "Next section is diverging (>2 TCBs)" +msgstr "" + +#: route_prog.lua +msgid "Route discarded." +msgstr "" + +#: route_prog.lua +msgid "Route ends at signal:" +msgstr "" + +#: route_prog.lua +msgid "Route leads into" +msgstr "" + +#: route_prog.lua +msgid "" +"Route programming mode active. Punch TCBs to add route segments, punch " +"turnouts to lock them." +msgstr "" + +#: route_prog.lua +msgid "Route section @1 removed." +msgstr "" + +#: route_prog.lua +msgid "Routes should in most cases end at signals." +msgstr "" + +#: route_prog.lua +msgid "Save Route" +msgstr "" + +#: route_prog.lua +msgid "Step back one section" +msgstr "" + +#: route_prog.lua +msgid "Successfully programmed route." +msgstr "" + +#: route_prog.lua +msgid "The origin TCB has become unknown during programming. Try again." +msgstr "" + +#: route_prog.lua +msgid "This TCB is not suitable as" +msgstr "" + +#: route_prog.lua +msgid "This TCB is unconfigured, you first need to assign it to a rail" +msgstr "" + +#: route_prog.lua +msgid "WARNING: Route does not end at a signal." +msgstr "" + +#: route_prog.lua +msgid "[Route programming] " +msgstr "" + +#: route_prog.lua +msgid "impossible at this place." +msgstr "" + +#: route_prog.lua +msgid "non-interlocked area" +msgstr "" + +#: route_prog.lua +msgid "route continuation." +msgstr "" + +#: route_ui.lua +msgid "<< Select a route part to edit options" +msgstr "" + +#: route_ui.lua +#, fuzzy +msgid "<Default Aspect>" +msgstr "預設座位" + +#: route_ui.lua +msgid "ARS Rule List" +msgstr "" + +#: route_ui.lua +msgid "Announce distant signal" +msgstr "" + +#: route_ui.lua +msgid "Back to signal" +msgstr "" + +#: route_ui.lua +msgid "Call-on (section may be occupied)" +msgstr "" + +#: route_ui.lua +msgid "Clone Route" +msgstr "" + +#: route_ui.lua +msgid "Delete Route" +msgstr "" + +#: route_ui.lua +msgid "Error:" +msgstr "" + +#: route_ui.lua +msgid "New From Route" +msgstr "" + +#: route_ui.lua +msgid "No Signal at this TCB" +msgstr "" + +#: route_ui.lua +msgid "Route name" +msgstr "" + +#: route_ui.lua +msgid "Route overview" +msgstr "" + +#: route_ui.lua +msgid "Save ARS List" +msgstr "" + +#: route_ui.lua +msgid "Section Options:" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Set" +msgstr "" + +#: route_ui.lua signal_aspect_ui.lua +#, fuzzy +msgid "Signal Aspect:" +msgstr "色燈號誌機" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 has different section than previous TCB" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "TCB at @1 is not assigned to previous track section" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Track section after @1 missing" +msgstr "" + +#: route_ui.lua tcb_ts_ui.lua +msgid "Turnout/component missing at @1" +msgstr "" + +#: routesetting.lua +msgid "Lock conflict at @1, Held locked by:" +msgstr "" + +#: routesetting.lua +msgid "No TCB found at @1. Please update or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "No track section adjacent to @1. Please reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2" +msgstr "" + +#: routesetting.lua +msgid "Route @1 from signal @2, segment #@3" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' already has route set from @2:" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' is occupied!" +msgstr "" + +#: routesetting.lua +msgid "Section '@1' not found!" +msgstr "" + +#: routesetting.lua +msgid "" +"TCB at @1 has different section than previous TCB. Please update track " +"section or reconfigure route!" +msgstr "" + +#: routesetting.lua +msgid "" +"Turnout/component missing at @1. Please update track section or reconfigure " +"route!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<assign distant>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "<none>" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned distant signal to the main signal at @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Assigned signal to the TCB at @1" +msgstr "" + +#: signal_aspect_ui.lua tool.lua +msgid "Clear" +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Influence point of another signal is already present!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Node is too far away. Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "" +"Configuring Signal: Please look in train's driving direction and punch rail " +"to set influence point." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: Successfully set influence point" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Configuring Signal: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Dst: @1" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is not set." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Influence point is set at @1." +msgstr "" + +#: signal_aspect_ui.lua +msgid "Modify" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set distant signal: Punch the main signal to assign!" +msgstr "" + +#: signal_aspect_ui.lua +msgid "Set influence point" +msgstr "" + +#: smartroute.lua +msgid "Apply" +msgstr "" + +#: smartroute.lua +msgid "Route search: @1 found" +msgstr "" + +#: smartroute.lua +msgid "Search further" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: No track section directly ahead!" +msgstr "" + +#: smartroute.lua +msgid "Smartroute: TCBS or routes don't exist here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid " (invalid)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "@1 locks in state @2" +msgstr "" + +#: tcb_ts_ui.lua +msgid "A route is requested from this signal:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Add locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Assign a signal" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic Working is active." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Automatic routesetting" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Boundary TCBs:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove TCB: Both sides must have no signal assigned!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Can't remove track, a train is here!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Cancel Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Cannot delete route which has ARS rules, please review and then delete " +"through edit dialog!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Clear locks" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"Configuring TCB: Already existed at this position, it is now linked to this " +"TCB marker" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Cannot use static signals for routesetting. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Internal error, TCBS doesn't exist. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Node is too far away. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Not a compatible signal. Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the rail you want to assign this TCB to." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Please punch the signal to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully assigned signal." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: Successfully configured TCB" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Configuring TCB: This is not a normal two-connection rail! Aborted." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Create Interlocked Track Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Delete this route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Disable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Distant signal triggers ARS" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Edit" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Enable Automatic Working" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Error: TS modified, abort!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Final TCBS unset (legacy-style buffer route)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Fixed route locks (e.g. level crossings):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Link: @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Multiple routes are requested (first available is set):" +msgstr "" + +#: tcb_ts_ui.lua +msgid "NOTE: ARS is disabled." +msgstr "" + +#: tcb_ts_ui.lua +msgid "New (Manual)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No Link" +msgstr "" + +#: tcb_ts_ui.lua +msgid "No routes are yet defined." +msgstr "" + +#: tcb_ts_ui.lua +msgid "No trains on this section." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Punch components to add fixed locks. (punch anything else = end)" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Remove Section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Reset section state" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Reset track section" +msgstr "改變行車方向" + +#: tcb_ts_ui.lua +msgid "Reset track section @1!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route has been set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is re-set when a train passed." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set over this signal by:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Route is set: " +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes are not automatically set." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Routes:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Section holds @1 route locks." +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Section name" +msgstr "車站名稱" + +#: tcb_ts_ui.lua +msgid "Set ARS default route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Set Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Setting fixed locks finished!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Show track section" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Side @1" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signal at @1" +msgstr "色燈號誌機" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signal name" +msgstr "色燈號誌機" + +#: tcb_ts_ui.lua +msgid "Signal on B side already assigned!" +msgstr "" + +#: tcb_ts_ui.lua +#, fuzzy +msgid "Signalling" +msgstr "色燈號誌機" + +#: tcb_ts_ui.lua +msgid "Smart Route" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB Link: Select linked TCB now!" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB already existed at this position, now linked to this node" +msgstr "" + +#: tcb_ts_ui.lua +msgid "TCB assigned to @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "This TCB has been removed. Please dig marker." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is a pure distant signal\n" +"No route is currently set through." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This is an always-halt signal (e.g. a buffer)\n" +"No routes can be set from here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will clear the list of trains\n" +"and the routesetting status of this section.\n" +"Are you sure?" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"This will remove the track section and set all its end points to End Of " +"Interlocking" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Circuit Break Configuration" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Track Section Detail - @1" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Trains on this section:" +msgstr "" + +#: tcb_ts_ui.lua +msgid "Unconfigured Track Circuit Break, right-click to assign." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Wait for this route to be cancelled in order to do anything here." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Waiting for route to be set..." +msgstr "" + +#: tcb_ts_ui.lua +msgid "Yes" +msgstr "" + +#: tcb_ts_ui.lua +msgid "" +"You cannot modify track sections when a route is set or a train is on the " +"section." +msgstr "" + +#: tool.lua +msgid "Emplace manual lock" +msgstr "" + +#: tool.lua +msgid "" +"Interlocking tool\n" +"Punch: Highlight track section\n" +"Place: check route locks/show track section info" +msgstr "" + +#: tool.lua +msgid "No route locks set" +msgstr "" + +#: tool.lua +msgid "No track section at this location!" +msgstr "" + +#: tool.lua +msgid "Node is not a track!" +msgstr "" + +#: tool.lua +msgid "Route lock inspector" +msgstr "" + +#: tool.lua +msgid "Route locks currently put:" +msgstr "" + +#: tsr_rail.lua +msgid "Point Speed Restriction Track" +msgstr "" + +#: tsr_rail.lua +msgid "Point speed restriction: @1" +msgstr "" + +#: tsr_rail.lua +msgid "Set point speed restriction:" +msgstr "" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track without the @1 privilege." +msgstr "您沒有「@1」許可權，不能調整這段軌道。" + +#: tsr_rail.lua +msgid "You are not allowed to configure this track." +msgstr "您不能調整這段軌道。" + +#~ msgid "(Doors closed)" +#~ msgstr "(車門已關閉)" + +#~ msgid "3-way turnout" +#~ msgstr "三開道岔" + +#~ msgid "90+Angle Diamond Crossing Track" +#~ msgstr "交叉軌道 (其中一條軌道與座標軸平行)" + +#~ msgid "<No coupler>" +#~ msgstr "<無連結器>" + +#~ msgid "@1 Platform (45 degree)" +#~ msgstr "較高的@1月臺 (45°)" + +#~ msgid "@1 Platform (high)" +#~ msgstr "較高的@1月臺" + +#~ msgid "@1 Platform (low)" +#~ msgstr "較低的@1月臺" + +#~ msgid "@1 Platform (low, 45 degree)" +#~ msgstr "較低的@1月臺 (45°)" + +#~ msgid "@1 Slope" +#~ msgstr "@1斜坡" + +#~ msgid "ATC Kick command warning: doors are closed." +#~ msgstr "ATC 警告：車門已關閉，無法踢出乘客。" + +#~ msgid "ATC Kick command warning: train moving." +#~ msgstr "ATC 警告：火車正在移動，無法踢出乘客。" + +#~ msgid "ATC Reverse command warning: didn't reverse train, train moving." +#~ msgstr "ATC 警告：火車正在移動，無法改變行車方向。" + +#~ msgid "ATC command parse error: Unknown command: @1" +#~ msgstr "ATC 語法錯誤：未知命令：@1" + +#~ msgid "ATC command syntax error: I statement not closed: @1" +#~ msgstr "ATC 語法錯誤：「I」命令不完整：@1" + +#~ msgid "ATC controller" +#~ msgstr "ATC 控制器" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Channel: @2" +#~ msgstr "" +#~ "ATC 控制器\n" +#~ "模式：@1\n" +#~ "頻道：@2" + +#~ msgid "" +#~ "ATC controller, mode @1\n" +#~ "Command: @2" +#~ msgstr "" +#~ "ATC 控制器\n" +#~ "模式：@1\n" +#~ "命令：@2" + +#~ msgid "Access to @1" +#~ msgstr "可前往@1" + +#~ msgid "Andrew's Cross" +#~ msgstr "平交道號誌燈" + +#~ msgid "Back of train would end up off track, cancelling." +#~ msgstr "火車後部不在軌道上。" + +#~ msgid "Big Industrial Train Engine" +#~ msgstr "大型工業用火車頭" + +#~ msgid "Boiler" +#~ msgstr "鍋爐" + +#~ msgid "Box Wagon" +#~ msgstr "貨運車廂" + +#~ msgid "Buffer and Chain Coupler" +#~ msgstr "鏈式連結器" + +#~ msgid "Bumper" +#~ msgstr "保險槓" + +#~ msgid "Can not couple: The couplers of the trains do not match (@1 and @2)." +#~ msgstr "您無法連結這兩節車廂：這兩節車廂使用不同的連結器 (@1和@2)。" + +#~ msgid "Can't get on: wagon full or doors closed!" +#~ msgstr "無法上車：車門已關閉或車廂已滿。" + +#, fuzzy +#~ msgid "Can't place: Not enough slope items left (@1 required)" +#~ msgstr "無法放置斜坡：您沒有足夠的鐵路斜坡放置工具 (您總共需要@1個)" + +#, fuzzy +#~ msgid "Can't place: There's no slope of length @1" +#~ msgstr "無法放置斜坡：advtrains 不支援長度為@1米的斜坡。" + +#, fuzzy +#~ msgid "Can't place: no supporting node at upper end." +#~ msgstr "無法放置斜坡：較高階沒有支撐方塊。" + +#, fuzzy +#~ msgid "Can't place: not pointing at node" +#~ msgstr "無法放置斜坡：您沒有選擇任何方塊。" + +#~ msgid "Can't place: protected position!" +#~ msgstr "無法放置：此區域已被保護。" + +#, fuzzy +#~ msgid "Can't place: space occupied!" +#~ msgstr "無法放置斜坡：此區域已被佔用。" + +#~ msgid "Chimney" +#~ msgstr "煙囪" + +#~ msgid "Command" +#~ msgstr "命令" + +#~ msgid "Command (on)" +#~ msgstr "命令 (啟用時)" + +#~ msgid "Default Seat (driver stand)" +#~ msgstr "預設座位 (司機座位)" + +#~ msgid "Dep. Speed" +#~ msgstr "出發速度" + +#~ msgid "Deprecated Track" +#~ msgstr "請不要使用" + +#~ msgid "Detailed Steam Engine" +#~ msgstr "精細的蒸汽機車" + +#~ msgid "Detector Rail" +#~ msgstr "探測軌道" + +#~ msgid "Diagonal Diamond Crossing Track" +#~ msgstr "交叉軌道" + +#~ msgid "Digiline channel" +#~ msgstr "Digiline 頻道" + +#~ msgid "Door Delay" +#~ msgstr "車門關閉時間" + +#~ msgid "" +#~ "Doors are closed. Use Sneak+rightclick to ignore the closed doors and get " +#~ "off." +#~ msgstr "車門已關閉，請使用潛行+右鍵單擊下車。" + +#, fuzzy +#~ msgid "Driver Stand" +#~ msgstr "司機座位" + +#~ msgid "Driver Stand (left)" +#~ msgstr "左側司機座位" + +#~ msgid "Driver Stand (right)" +#~ msgstr "右側司機座位" + +#~ msgid "Driver stand" +#~ msgstr "司機座位" + +#~ msgid "Driver's cab" +#~ msgstr "駕駛室" + +#~ msgid "Get off" +#~ msgstr "下車" + +#~ msgid "Get off (forced)" +#~ msgstr "強制下車" + +#~ msgid "Industrial Train Engine" +#~ msgstr "工業用火車頭" + +#~ msgid "Industrial tank wagon" +#~ msgstr "液體運輸車廂" + +#~ msgid "Industrial wood wagon" +#~ msgstr "木材運輸車廂" + +#~ msgid "Japanese Train Engine" +#~ msgstr "高速列車車頭" + +#~ msgid "Japanese Train Inter-Wagon Connection" +#~ msgstr "日本火車連結器" + +#~ msgid "Japanese Train Wagon" +#~ msgstr "高速列車車廂" + +#, fuzzy +#~ msgid "Japanese signal pole" +#~ msgstr "高速列車車廂" + +#~ msgid "Kick out passengers" +#~ msgstr "踢出乘客" + +#~ msgid "Lampless Signal" +#~ msgstr "臂木式號誌機" + +#~ msgid "Line" +#~ msgstr "火車線路" + +#~ msgid "Loading Track" +#~ msgstr "裝貨軌道" + +#~ msgid "Lock couples" +#~ msgstr "鎖定連結處" + +#~ msgid "No such lua entity." +#~ msgstr "您沒有指向一個可以用火車複製工具複製的物體。" + +#~ msgid "No such train: @1." +#~ msgstr "ID 為「@1」的列車不存在。" + +#~ msgid "No such wagon: @1." +#~ msgstr "ID 為「@1」的車廂不存在。" + +#, fuzzy +#~ msgid "Not allowed to do this." +#~ msgstr "您不能調整這段軌道。" + +#~ msgid "Passenger Wagon" +#~ msgstr "客車" + +#, fuzzy +#~ msgid "Passenger area" +#~ msgstr "客車" + +#~ msgid "" +#~ "Passive Component Naming Tool\n" +#~ "\n" +#~ "Right-click to name a passive component." +#~ msgstr "" +#~ "被動元件命名工具\n" +#~ "\n" +#~ "右鍵單擊命名所選元件。" + +#~ msgid "Perpendicular Diamond Crossing Track" +#~ msgstr "垂直交叉軌道" + +#~ msgid "Routingcode" +#~ msgstr "路由碼" + +#~ msgid "Save" +#~ msgstr "儲存" + +#~ msgid "Save wagon properties" +#~ msgstr "儲存車廂屬性" + +#~ msgid "Scharfenberg Coupler" +#~ msgstr "Scharfenberg 式連結器" + +#~ msgid "Select seat:" +#~ msgstr "請選擇座位：" + +#~ msgid "Show Inventory" +#~ msgstr "顯示物品欄" + +#~ msgid "Speed:" +#~ msgstr "速度" + +#~ msgid "Station Code" +#~ msgstr "車站碼" + +#~ msgid "Station/Stop Track" +#~ msgstr "車站軌道" + +#~ msgid "Steam Engine" +#~ msgstr "蒸汽機車" + +#~ msgid "Stop Time" +#~ msgstr "停站時間" + +#~ msgid "Subway Passenger Wagon" +#~ msgstr "地鐵車廂" + +#~ msgid "Target:" +#~ msgstr "目標速度" + +#~ msgid "Text displayed inside train" +#~ msgstr "車廂內部顯示" + +#~ msgid "Text displayed outside on train" +#~ msgstr "車廂外部顯示" + +#, fuzzy +#~ msgid "That wagon does not exist!" +#~ msgstr "這節車廂沒有座位。" + +#~ msgid "The clipboard couldn't access the metadata. Copy failed." +#~ msgstr "無法複製：剪貼簿無法訪問元資料。" + +#~ msgid "The clipboard couldn't access the metadata. Paste failed." +#~ msgstr "無法貼上：剪貼簿無法訪問元資料。" + +#~ msgid "The clipboard is empty." +#~ msgstr "剪貼簿是空的。" + +#, fuzzy +#~ msgid "The track you are trying to place the wagon on is not long enough!" +#~ msgstr "軌道太短。" + +#~ msgid "The track you are trying to place the wagon on is not long enough." +#~ msgstr "軌道太短。" + +#, fuzzy +#~ msgid "This Wagon ID" +#~ msgstr "車廂已滿。" + +#, fuzzy +#~ msgid "This node can't be changed using the trackworker!" +#~ msgstr "您不能使用鐵路調整工具調整這個方塊。" + +#, fuzzy +#~ msgid "This node can't be rotated using the trackworker!" +#~ msgstr "您不能使用鐵路調整工具旋轉這個方塊。" + +#, fuzzy +#~ msgid "This node can't be rotated using the trackworker," +#~ msgstr "您不能使用鐵路調整工具旋轉這個方塊。" + +#~ msgid "This position is protected!" +#~ msgstr "這裡已被保護。" + +#~ msgid "This track can not be changed." +#~ msgstr "您不能調整這段軌道。" + +#, fuzzy +#~ msgid "This track can not be removed!" +#~ msgstr "您不能移除這段軌道。" + +#, fuzzy +#~ msgid "This track can not be rotated!" +#~ msgstr "您不能旋轉這段軌道。" + +#~ msgid "This wagon has no seats." +#~ msgstr "這節車廂沒有座位。" + +#~ msgid "This wagon is full." +#~ msgstr "車廂已滿。" + +#~ msgid "This wagon is owned by @1, you can't destroy it." +#~ msgstr "這是 @1 的車廂，您不能摧毀它。" + +#~ msgid "Track" +#~ msgstr "軌道" + +#~ msgid "" +#~ "Track Worker Tool\n" +#~ "\n" +#~ "Left-click: change rail type (straight/curve/switch)\n" +#~ "Right-click: rotate object" +#~ msgstr "" +#~ "鐵路調整工具\n" +#~ "\n" +#~ "左鍵單擊：切換軌道型別\n" +#~ "右鍵單擊：旋轉方塊" + +#, fuzzy +#~ msgid "Train " +#~ msgstr "已複製火車。" + +#~ msgid "Train copied." +#~ msgstr "已複製火車。" + +#~ msgid "" +#~ "Train copy/paste tool\n" +#~ "\n" +#~ "Left-click: copy train\n" +#~ "Right-click: paste train" +#~ msgstr "" +#~ "火車複製工具\n" +#~ "\n" +#~ "左鍵單擊：複製\n" +#~ "右鍵單擊：粘帖" + +#~ msgid "Unconfigured ATC controller" +#~ msgstr "ATC 控制器 (未配置)" + +#~ msgid "Unconfigured LuaATC component" +#~ msgstr "LuaATC 元件 (未配置)" + +#~ msgid "Unloading Track" +#~ msgstr "卸貨軌道" + +#~ msgid "Use Sneak+rightclick to bypass closed doors!" +#~ msgstr "請使用潛行+右鍵上車。" + +#, fuzzy +#~ msgid "Wagon Properties Tool" +#~ msgstr "車廂屬性" + +#~ msgid "Wagon properties" +#~ msgstr "車廂屬性" + +#~ msgid "Wallmounted Signal (left)" +#~ msgstr "壁掛式色燈號誌機 (左側)" + +#~ msgid "Wallmounted Signal (right)" +#~ msgstr "壁掛式色燈號誌機 (右側)" + +#~ msgid "Wallmounted Signal (top)" +#~ msgstr "懸掛式色燈號誌機" + +#~ msgid "" +#~ "Warning: If you destroy this wagon, you only get some steel back! If you " +#~ "are sure, hold Sneak and left-click the wagon." +#~ msgstr "" +#~ "警告：如果您摧毀此車廂，您只能拿到一些鋼方塊。如果您確定要摧毀這節車廂，請" +#~ "按潛行鍵並左鍵單擊此車廂。" + +#~ msgid "Wheel" +#~ msgstr "車輪" + +#~ msgid "Y-turnout" +#~ msgstr "對稱道岔" + +#~ msgid "You are not allowed to build near tracks at this protected position." +#~ msgstr "這裡已被保護，您不能在這裡的鐵路附近建任何東西。" + +#~ msgid "" +#~ "You are not allowed to build near tracks without the track_builder " +#~ "privilege." +#~ msgstr "您沒有「train_operator」許可權，不能在鐵路附近建任何東西。" + +#~ msgid "You are not allowed to build tracks at this protected position." +#~ msgstr "這裡已被保護，您不能在這裡建造鐵路。" + +#~ msgid "" +#~ "You are not allowed to build tracks without the track_builder privilege." +#~ msgstr "您沒有「train_operator」許可權，不能在這裡建造鐵路。" + +#~ msgid "" +#~ "You are not allowed to configure this LuaATC component without the @1 " +#~ "privilege." +#~ msgstr "您沒有「@1」許可權，不能配置這個 LuaATC 元件。" + +#~ msgid "" +#~ "You are not allowed to couple trains without the train_operator privilege." +#~ msgstr "您沒有「train_operator」許可權，不能連結這兩節車廂。" + +#, fuzzy +#~ msgid "You are not allowed to modify this protected track." +#~ msgstr "這裡已被保護，您不能在這裡建造鐵路。" + +#~ msgid "" +#~ "You are not allowed to name LuaATC passive components without the @1 " +#~ "privilege." +#~ msgstr "您沒有「@1」許可權，不能命名這個元件。" + +#~ msgid "" +#~ "You are not allowed to operate turnouts and signals without the " +#~ "railway_operator privilege." +#~ msgstr "您沒有「railway_operator」許可權，不能控制鐵路設施。" + +#~ msgid "You do not have the @1 privilege." +#~ msgstr "您沒有「@1」許可權。" + +#, fuzzy +#~ msgid "You don't have the train_operator privilege." +#~ msgstr "您沒有「@1」許可權。" + +#~ msgid "" +#~ "You need to own at least one neighboring wagon to destroy this couple." +#~ msgstr "您必須至少擁有其中一節車廂才能分開這兩節車廂。" diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua index 6abe431..96bd211 100644 --- a/advtrains_interlocking/route_prog.lua +++ b/advtrains_interlocking/route_prog.lua @@ -19,6 +19,14 @@ C. punch a turnout (or some other passive component) to fix its state (toggle) The route visualization will also be used to visualize routes after they have been programmed. ]]-- +-- Get current translator +local S = advtrains.interlocking.translate + +-- TODO duplicate +local lntrans = { "A", "B" } +local function sigd_to_string(sigd) + return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s] +end -- table with objectRefs local markerent = {} @@ -106,15 +114,7 @@ end --[[ Route definition: -route = { - name = <string> - [n] = { - next = <sigd>, -- of the next (note: next) TCB on the route - locks = {<pts> = "state"} -- route locks of this route segment - } - terminal = <sigd>, - aspect = <signal aspect>,--note, might change in future -} +=== See database.lua L238 The first item in the TCB path (namely i=0) is always the start signal of this route, so this is left out. All subsequent entries, starting from 1, contain: @@ -126,11 +126,11 @@ the distant signal aspect is determined as DANGER. ]]-- local function chat(pname, message) - minetest.chat_send_player(pname, "[Route programming] "..message) + minetest.chat_send_player(pname, S("[Route programming] ")..message) end local function clear_lock(locks, pname, pts) locks[pts] = nil - chat(pname, pts.." is no longer affected when this route is set.") + chat(pname, S("@1 is no longer affected when this route is set.", pts)) end local function otherside(s) @@ -178,7 +178,12 @@ function advtrains.interlocking.visualize_route(origin, route, context, tmp_lcks -- display locks for pts, state in pairs(v.locks) do local pos = minetest.string_to_pos(pts) - routesprite(context, pos, "fix"..k..pts, "at_il_route_lock.png", "Fixed in state '"..state.."' by route "..route.name.." until segment #"..k.." is freed.") + if not pos then + pos = advtrains.decode_pos(pts) + end + routesprite(context, pos, "fix"..k..pts, "at_il_route_lock.png", + S("Fixed in state @1 by route @2 until segment #@3 is freed.", state, route.name, k) + ) end end @@ -197,15 +202,17 @@ function advtrains.interlocking.visualize_route(origin, route, context, tmp_lcks if node_ok then yaw = advtrains.dir_to_angle(conns[otherside(sigd.s)].c) end - routemarker(context, sigd.p, "rteterm"..i, "at_il_route_end.png", yaw, route.name.." Terminal "..i) + routemarker(context, sigd.p, "rteterm"..i, "at_il_route_end.png", yaw, + S("@1 Terminal @2", route.name, i)) end end end end -- display locks set by player for pts, state in pairs(tmp_lcks) do - local pos = minetest.string_to_pos(pts) - routesprite(context, pos, "fixp"..pts, "at_il_route_lock_edit.png", "Fixed in state '"..state.."' by route "..route.name.." (punch to unfix)", + local pos = advtrains.decode_pos(pts) + routesprite(context, pos, "fixp"..pts, "at_il_route_lock_edit.png", + S("Fixed in state @1 by route @2 (punch to unfix)", state, route.name), function() clear_lock(tmp_lcks, pname, pts) end) end end @@ -214,20 +221,33 @@ end local player_rte_prog = {} -function advtrains.interlocking.init_route_prog(pname, sigd) +function advtrains.interlocking.init_route_prog(pname, sigd, default_route) if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end - player_rte_prog[pname] = { + local rp = { origin = sigd, - route = { - name = "PROG["..pname.."]", - }, - tmp_lcks = {}, } - advtrains.interlocking.visualize_route(sigd, player_rte_prog[pname].route, "prog_"..pname, player_rte_prog[pname].tmp_lcks, pname) - minetest.chat_send_player(pname, "Route programming mode active. Punch TCBs to add route segments, punch turnouts to lock them.") + if default_route then + rp.route = table.copy(default_route) + + -- "Step back one section", but keeping turnouts + local last_route = rp.route[#rp.route] + if last_route then + rp.tmp_lcks = last_route.locks + rp.route[#rp.route] = nil + end + rp.route.name = "PROG["..pname.."]" + else + rp.route = { + name = "PROG["..pname.."]" + } + rp.tmp_lcks = {} + end + player_rte_prog[pname] = rp + advtrains.interlocking.visualize_route(sigd, rp.route, "prog_"..pname, rp.tmp_lcks, pname) + minetest.chat_send_player(pname, S("Route programming mode active. Punch TCBs to add route segments, punch turnouts to lock them.")) end local function get_last_route_item(origin, route) @@ -237,36 +257,39 @@ local function get_last_route_item(origin, route) return route[#route].next end -local function do_advance_route(pname, rp, sigd, tsname) +local function do_advance_route(pname, rp, sigd, tsref) table.insert(rp.route, {next = sigd, locks = rp.tmp_lcks}) rp.tmp_lcks = {} - chat(pname, "Added track section '"..tsname.."' to the route.") + chat(pname, S("Added track section @1 to the route.", (tsref and (tsref.name or "") or "--EOI--"))) end local function finishrpform(pname) local rp = player_rte_prog[pname] if not rp then return end - local form = "size[7,6]label[0.5,0.5;Finish programming route]" + rp.route.use_rscache = true + + local form = "size[7,6]label[0.5,0.5;"..S("Finish programming route").."]" local terminal = get_last_route_item(rp.origin, rp.route) if terminal then local term_tcbs = advtrains.interlocking.db.get_tcbs(terminal) if term_tcbs.signal then - form = form .. "label[0.5,1.5;Route ends at signal:]" - form = form .. "label[0.5,2 ;"..term_tcbs.signal_name.."]" + local signalname = (term_tcbs.signal_name or "") .. sigd_to_string(terminal) + form = form .. "label[0.5,1.5;"..S("Route ends at signal:").."]" + form = form .. "label[0.5,2 ;"..signalname.."]" else - form = form .. "label[0.5,1.5;WARNING: Route does not end at a signal.]" - form = form .. "label[0.5,2 ;Routes should in most cases end at signals.]" - form = form .. "label[0.5,2.5;Cancel if you are unsure!]" + form = form .. "label[0.5,1.5;"..S("WARNING: Route does not end at a signal.").."]" + form = form .. "label[0.5,2 ;"..S("Routes should in most cases end at signals.").."]" + form = form .. "label[0.5,2.5;"..S("Cancel if you are unsure!").."]" end else - form = form .. "label[0.5,1.5;Route leads into]" - form = form .. "label[0.5,2 ;non-interlocked area]" + form = form .. "label[0.5,1.5;"..S("Route leads into").."]" + form = form .. "label[0.5,2 ;"..S("non-interlocked area").."]" end - form = form.."field[0.8,3.5;5.2,1;name;Enter Route Name;]" - form = form.."button_exit[0.5,4.5; 5,1;save;Save Route]" - + form = form.."field[0.8,3.5;5.2,1;name;"..S("Enter Route Name")..";]" + form = form.."checkbox[0.8,4.0;use_rscache;"..S("Auto lock turnouts")..";true]" + form = form.."button_exit[0.5,5.0; 5,1;save;"..S("Save Route").."]" minetest.show_formspec(pname, "at_il_routepf", form) end @@ -313,7 +336,7 @@ local function check_advance_valid(tcbpos, rp) local adv_tcbs = advtrains.interlocking.db.get_tcbs(this_sigd) local next_tsid = adv_tcbs.ts_id local can_over, over_ts, next_tc_bs = false, nil, nil - local cannotover_rsn = "Next section is diverging (>2 TCBs)" + local cannotover_rsn = S("Next section is diverging (>2 TCBs)") if next_tsid then -- you may not advance over EOI. While this is technically possible, -- in practise this just enters an unnecessary extra empty route item. @@ -321,7 +344,7 @@ local function check_advance_valid(tcbpos, rp) next_tc_bs = over_ts.tc_breaks can_over = #next_tc_bs <= 2 else - cannotover_rsn = "End of interlocking" + cannotover_rsn = S("End of interlocking") end local over_sigd = nil @@ -363,29 +386,29 @@ local function show_routing_form(pname, tcbpos, message) -- show nothing at all -- In all cases, Discard and Backtrack buttons needed. - local form = "size[7,9.5]label[0.5,0.5;Advance/Complete Route]" + local form = "size[7,9.5]label[0.5,0.5;"..S("Advance/Complete Route").."]" if message then form = form .. "label[0.5,1;"..message.."]" end if advance_valid and not is_endpoint then - form = form.. "label[0.5,1.8;Advance to next route section]" + form = form.. "label[0.5,1.8;"..S("Advance to next route section").."]" form = form.."image_button[0.5,2.2; 5,1;at_il_routep_advance.png;advance;]" form = form.. "label[0.5,3.5;-------------------------]" else - form = form.. "label[0.5,2.3;This TCB is not suitable as]" - form = form.. "label[0.5,2.8;route continuation.]" + form = form.. "label[0.5,2.3;"..S("This TCB is not suitable as").."]" + form = form.. "label[0.5,2.8;"..S("route continuation.").."]" end if advance_valid or is_endpoint then - form = form.. "label[0.5,3.8;Finish route HERE]" + form = form.. "label[0.5,3.8;"..S("Finish route HERE").."]" form = form.."image_button[0.5, 4.2; 5,1;at_il_routep_end_here.png;endhere;]" if can_over then - form = form.. "label[0.5,5.3;Finish route at end of NEXT section]" + form = form.. "label[0.5,5.3;"..S("Finish route at end of NEXT section").."]" form = form.."image_button[0.5,5.7; 5,1;at_il_routep_end_over.png;endover;]" else - form = form.. "label[0.5,5.3;Advancing over next section is]" - form = form.. "label[0.5,5.8;impossible at this place.]" + form = form.. "label[0.5,5.3;"..S("Advancing over next section is").."]" + form = form.. "label[0.5,5.8;"..S("impossible at this place.").."]" if cannotover_rsn then form = form.. "label[0.5,6.3;"..cannotover_rsn.."]" end @@ -394,9 +417,9 @@ local function show_routing_form(pname, tcbpos, message) form = form.. "label[0.5,7;-------------------------]" if #rp.route > 0 then - form = form.."button[0.5,7.4; 5,1;retract;Step back one section]" + form = form.."button[0.5,7.4; 5,1;retract;"..S("Step back one section").."]" end - form = form.."button[0.5,8.4; 5,1;cancel;Cancel route programming]" + form = form.."button[0.5,8.4; 5,1;cancel;"..S("Cancel route programming").."]" minetest.show_formspec(pname, "at_il_rprog_"..minetest.pos_to_string(tcbpos), form) end @@ -423,20 +446,20 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.advance then -- advance route if not is_endpoint then - do_advance_route(pname, rp, this_sigd, this_ts.name) + do_advance_route(pname, rp, this_sigd, this_ts) end end if fields.endhere then if not is_endpoint then - do_advance_route(pname, rp, this_sigd, this_ts.name) + do_advance_route(pname, rp, this_sigd, this_ts) end finishrpform(pname) end if can_over and fields.endover then if not is_endpoint then - do_advance_route(pname, rp, this_sigd, this_ts.name) + do_advance_route(pname, rp, this_sigd, this_ts) end - do_advance_route(pname, rp, over_sigd, over_ts and over_ts.name or "--EOI--") + do_advance_route(pname, rp, over_sigd, over_ts) finishrpform(pname) end end @@ -447,12 +470,12 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end rp.tmp_locks = rp.route[#rp.route].locks rp.route[#rp.route] = nil - chat(pname, "Route section "..(#rp.route+1).." removed.") + chat(pname, S("Route section @1 removed.", (#rp.route+1))) end if fields.cancel then player_rte_prog[pname] = nil advtrains.interlocking.clear_visu_context("prog_"..pname) - chat(pname, "Route discarded.") + chat(pname, S("Route discarded.")) minetest.close_formspec(pname, formname) return end @@ -463,6 +486,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end if formname == "at_il_routepf" then + -- if it's the checkbox that changed handle before returning (stupid checkboxes) + if fields.use_rscache then + local rp = player_rte_prog[pname] + if rp then + rp.route.use_rscache = core.is_yes(fields.use_rscache) + end + end if not fields.save or not fields.name then return end if fields.name == "" then -- show form again @@ -473,13 +503,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local rp = player_rte_prog[pname] if rp then if #rp.route <= 0 then - chat(pname, "Cannot program route without a target") + chat(pname, S("Cannot program route without a target")) return end local tcbs = advtrains.interlocking.db.get_tcbs(rp.origin) if not tcbs then - chat(pname, "The origin TCB has become unknown during programming. Try again.") + chat(pname, S("The origin TCB has become unknown during programming. Try again.")) return end @@ -491,7 +521,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) advtrains.interlocking.clear_visu_context("prog_"..pname) player_rte_prog[pname] = nil - chat(pname, "Successfully programmed route.") + chat(pname, S("Successfully programmed route.")) advtrains.interlocking.show_route_edit_form(pname, rp.origin, #tcbs.routes) return @@ -514,7 +544,7 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing) local meta = minetest.get_meta(pos) local tcbpts = meta:get_string("tcb_pos") if tcbpts == "" then - chat(pname, "This TCB is unconfigured, you first need to assign it to a rail") + chat(pname, S("This TCB is unconfigured, you first need to assign it to a rail")) return end local tcbpos = minetest.string_to_pos(tcbpts) @@ -522,19 +552,22 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing) -- show formspec show_routing_form(pname, tcbpos) - advtrains.interlocking.visualize_route(rp.origin, rp.route, "prog_"..pname, rp.tmp_lcks, pname) - + return + elseif advtrains.interlocking.db.get_tcb(pos) then + -- the punched node itself is a TCB + show_routing_form(pname, pos) + advtrains.interlocking.visualize_route(rp.origin, rp.route, "prog_"..pname, rp.tmp_lcks, pname) return end if advtrains.is_passive(pos) then - local pts = advtrains.roundfloorpts(pos) + local pts = advtrains.encode_pos(pos) if rp.tmp_lcks[pts] then clear_lock(rp.tmp_lcks, pname, pts) else local state = advtrains.getstate(pos) rp.tmp_lcks[pts] = state - chat(pname, pts.." is held in "..state.." position when this route is set and freed ") + chat(pname, S("@1 is held in @2 position when this route is set and freed ", pts, state)) end advtrains.interlocking.visualize_route(rp.origin, rp.route, "prog_"..pname, rp.tmp_lcks, pname) return diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua index 1999941..9ecc947 100644 --- a/advtrains_interlocking/route_ui.lua +++ b/advtrains_interlocking/route_ui.lua @@ -1,8 +1,12 @@ -- route_ui.lua -- User interface for showing and editing routes +-- Get current translator +local S = advtrains.interlocking.translate + local atil = advtrains.interlocking local ildb = atil.db +local F = advtrains.formspec -- TODO duplicate local lntrans = { "A", "B" } @@ -10,12 +14,13 @@ local function sigd_to_string(sigd) return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s] end +-- indexed by pname +local sel_rpartcache = {} - -function atil.show_route_edit_form(pname, sigd, routeid) +function atil.show_route_edit_form(pname, sigd, routeid, sel_rpartidx) if not minetest.check_player_privs(pname, {train_operator=true, interlocking=true}) then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end @@ -24,80 +29,171 @@ function atil.show_route_edit_form(pname, sigd, routeid) local route = tcbs.routes[routeid] if not route then return end - local form = "size[9,10]label[0.5,0.2;Route overview]" - form = form.."field[0.8,1.2;6.5,1;name;Route name;"..minetest.formspec_escape(route.name).."]" - form = form.."button[7.0,0.9;1.5,1;setname;Set]" + local form = "size[9,11]label[0.5,0.2;"..S("Route overview").."]" + form = form.."field[0.8,1.2;6.5,1;name;"..S("Route name")..";"..minetest.formspec_escape(route.name).."]" + form = form.."button[7.0,0.9;1.5,1;setname;"..S("Set").."]" -- construct textlist for route information local tab = {} - local function itab(t) + local tabref = {} + local function itab(rseg, t, rty, rpara) tab[#tab+1] = minetest.formspec_escape(string.gsub(t, ",", " ")) + tabref[#tab] = { [rty] = true, param = rpara, seg = rseg, idx = #tab } end - itab("TCB "..sigd_to_string(sigd).." ("..tcbs.signal_name..") Route #"..routeid) + itab(1, "("..(tcbs.signal_name or "+")..") Route #"..routeid, "signal", sigd) -- this code is partially copy-pasted from routesetting.lua -- we start at the tc designated by signal local c_sigd = sigd local i = 1 - local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp + local c_tcbs, c_ts_id, c_ts, c_rseg while c_sigd and i<=#route do c_tcbs = ildb.get_tcbs(c_sigd) if not c_tcbs then - itab("-!- No TCBS at "..sigd_to_string(c_sigd)..". Please reconfigure route!") + itab(i, "-!- "..S("TCB at @1 is missing", sigd_to_string(c_sigd)), "err", nil) break end c_ts_id = c_tcbs.ts_id if not c_ts_id then - itab("-!- No track section adjacent to "..sigd_to_string(c_sigd)..". Please reconfigure route!") + itab(i, "-!- "..S("Track section after @1 missing", sigd_to_string(c_sigd)), "err", nil) break end c_ts = ildb.get_ts(c_ts_id) c_rseg = route[i] - c_lckp = {} - itab(""..i.." Entry "..sigd_to_string(c_sigd).." -> Sec. "..(c_ts and c_ts.name or "-").." -> Exit "..(c_rseg.next and sigd_to_string(c_rseg.next) or "END")) + local signame = "-" + if c_tcbs and c_tcbs.signal then signame = c_tcbs.signal_name or "o" end + itab(i, ""..i.." "..sigd_to_string(c_sigd).." ("..signame..")", "signal", c_sigd) + itab(i, "= "..(c_ts and c_ts.name or c_ts_id).." ="..(c_rseg.call_on and " [CO]" or ""), "section", c_ts_id) if c_rseg.locks then for pts, state in pairs(c_rseg.locks) do - local pos = minetest.string_to_pos(pts) - itab(" Lock: "..pts.." -> "..state) + local pos = advtrains.decode_pos(pts) + itab(i, "L "..pts.." -> "..state, "lock", pos) if not advtrains.is_passive(pos) then - itab("-!- No passive component at "..pts..". Please reconfigure route!") + itab(i, "-!- "..S("Turnout/component missing at @1", minetest.pos_to_string(pos)), "err", nil) break end end end + -- sanity check, is section at next the same as the current? + local nvar = c_rseg.next + if nvar then + local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1}) + if not re_tcbs then + itab(i, "-!- "..S("TCB at @1 is missing", minetest.pos_to_string(nvar.p)), "err", nil) + break + elseif not re_tcbs.ts_id then + itab(i, "-!- "..S("TCB at @1 is not assigned to previous track section", minetest.pos_to_string(nvar.p)), "err", nil) + break + elseif re_tcbs.ts_id~=c_ts_id then + itab(i, "-!- "..S("TCB at @1 has different section than previous TCB", minetest.pos_to_string(nvar.p)), "err", nil) + break + end + end -- advance - c_sigd = c_rseg.next + c_sigd = nvar i = i + 1 end if c_sigd then local e_tcbs = ildb.get_tcbs(c_sigd) - itab("Route end: "..sigd_to_string(c_sigd).." ("..(e_tcbs and e_tcbs.signal_name or "-")..")") + local signame = "-" + if e_tcbs and e_tcbs.signal then signame = e_tcbs.signal_name or "o" end + itab(i, "E "..sigd_to_string(c_sigd).." ("..signame..")", "end", c_sigd) + else + itab(i, "E (none)", "end", nil) + end + + itab(i, S("(More Options)"), "advanced", nil) + + if not sel_rpartidx then sel_rpartidx = 1 end + form = form.."textlist[0.5,2;3.5,3.9;routelog;"..table.concat(tab, ",")..";"..(sel_rpartidx or 1)..";false]" + + -- to the right of rtelog, controls are displayed for the thing in focus + -- What is in focus is determined by the parameter sel_rpartidx + + local sel_rpart = tabref[sel_rpartidx] + --atdebug("sel rpart",sel_rpart) + + if sel_rpart and sel_rpart.signal then + -- get TCBS here and rseg selected + local s_tcbs = ildb.get_tcbs(sel_rpart.param) + local rseg = route[sel_rpart.seg] + -- main aspect list + local signalpos = s_tcbs and s_tcbs.signal + if signalpos and rseg then + form = form..F.label(4.5, 2, S("Signal Aspect:")) + local ndef = signalpos and advtrains.ndb.get_ndef(signalpos) + if ndef and ndef.advtrains and ndef.advtrains.main_aspects then + local entries = { S("<Default Aspect>") } + local sel = 1 + for i, mae in ipairs(ndef.advtrains.main_aspects) do + entries[i+1] = mae.description + if mae.name == rseg.main_aspect then + sel = i+1 + end + end + form = form..F.dropdown(4.5, 3.0, 4, "sa_main_aspect", entries, sel, true) + end + -- checkbox for assign distant signal + local assign_dst = rseg.assign_dst + if assign_dst == nil then + assign_dst = (sel_rpart.seg~=1) -- special behavior when assign_dst is nil (and not false): + -- defaults to false for the very first signal and true for all others (= minimal user configuration overhead) + -- Note: on save, the value will be fixed at either false or true + end + form = form..string.format("checkbox[4.5,4.0;sa_distant;"..S("Announce distant signal")..";%s]", assign_dst) + else + form = form..F.label(4.5, 2, S("No Signal at this TCB")) + end + elseif sel_rpart and sel_rpart.section then + local rseg = route[sel_rpart.seg] + if rseg then + form = form..F.label(4.5, 2, S("Section Options:")) + -- checkbox for call-on + form = form..string.format("checkbox[4.5,4.0;se_callon;"..S("Call-on (section may be occupied)")..";%s]", rseg.call_on) + end + elseif sel_rpart and sel_rpart.advanced then + form = form..F.label(4.5, 2, S("Advanced Options:")) + -- checkbox for call-on + form = form..string.format("checkbox[4.5,4.0;ad_use_rscache;"..S("Auto lock turnouts")..";%s]", route.use_rscache) + elseif sel_rpart and sel_rpart.err then + form = form.."textarea[4.5,2.5;4,4;errorta;"..S("Error:")..";"..tab[sel_rpartidx].."]" else - itab("Route ends on dead-end") + form = form..F.label(4.5, 2, S("<< Select a route part to edit options")) end - form = form.."textlist[0.5,2;7.75,3.9;rtelog;"..table.concat(tab, ",").."]" + form = form.."button[0.5,6;1,1;prev;<<<]" + form = form.."button[1.5,6;1,1;back;"..routeid.."/"..#tcbs.routes.."]" + form = form.."button[2.5,6;1,1;next;>>>]" + - form = form.."button[0.5,6;3,1;back;<<< Back to signal]" - form = form.."button[4.5,6;2,1;aspect;Signal Aspect]" - form = form.."button[6.5,6;2,1;delete;Delete Route]" + --if route.smartroute_generated or route.default_autoworking then + -- form = form.."button[3.5,6;2,1;noautogen;Clr Autogen]" + --end + form = form.."button[5.5,6;3,1;delete;"..S("Delete Route").."]" + form = form.."button[0.5,7;3,1;back;"..S("Back to signal").."]" + form = form.."button[3.5,7;2,1;clone;"..S("Clone Route").."]" + form = form.."button[5.5,7;3,1;newfrom;"..S("New From Route").."]" --atdebug(route.ars) form = form.."style[ars;font=mono]" - form = form.."textarea[0.8,7.3;5,3;ars;ARS Rule List;"..atil.ars_to_text(route.ars).."]" - form = form.."button[5.5,7.23;3,1;savears;Save ARS List]" + form = form.."textarea[0.8,8.3;5,3;ars;"..S("ARS Rule List")..";"..atil.ars_to_text(route.ars).."]" + form = form.."button[5.5,8.23;3,1;savears;"..S("Save ARS List").."]" - minetest.show_formspec(pname, "at_il_routeedit_"..minetest.pos_to_string(sigd.p).."_"..sigd.s.."_"..routeid, form) - + local formname = "at_il_routeedit_"..minetest.pos_to_string(sigd.p).."_"..sigd.s.."_"..routeid + minetest.show_formspec(pname, formname, form) + -- record selected entry from routelog for receive fields callback + sel_rpartcache[pname] = sel_rpart end minetest.register_on_player_receive_fields(function(player, formname, fields) local pname = player:get_player_name() + -- retreive sel_rpart from the cache in any case and clear it out + local sel_rpart = sel_rpartcache[pname] if not minetest.check_player_privs(pname, {train_operator=true, interlocking=true}) then return end @@ -118,26 +214,93 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local route = tcbs.routes[routeid] if not route then return end + if fields.prev then + atil.show_route_edit_form(pname, sigd, routeid - 1) + return + end + if fields.next then + atil.show_route_edit_form(pname, sigd, routeid + 1) + return + end + if fields.setname and fields.name then route.name = fields.name end - if fields.aspect then - local suppasp = advtrains.interlocking.signal_get_supported_aspects(tcbs.signal) - - local callback = function(pname, asp) - route.aspect = asp - advtrains.interlocking.show_route_edit_form(pname, sigd, routeid) + if fields.sa_main_aspect and sel_rpart and sel_rpart.signal then + local idx = tonumber(fields.sa_main_aspect) + -- get TCBS here and rseg selected + local s_tcbs = ildb.get_tcbs(sel_rpart.param) + local rseg = route[sel_rpart.seg] + -- main aspect list + local signalpos = s_tcbs and s_tcbs.signal + if rseg then + rseg.main_aspect = nil + if idx > 1 then + local ndef = signalpos and advtrains.ndb.get_ndef(signalpos) + if ndef and ndef.advtrains and ndef.advtrains.main_aspects then + rseg.main_aspect = ndef.advtrains.main_aspects[idx - 1].name + end + end end - - advtrains.interlocking.show_signal_aspect_selector(pname, suppasp, route.name, callback, route.aspect or advtrains.interlocking.GENERIC_FREE) - return end + if fields.sa_distant and sel_rpart and sel_rpart.signal then + local rseg = route[sel_rpart.seg] + if rseg then + rseg.assign_dst = minetest.is_yes(fields.sa_distant) + end + end + if fields.se_callon and sel_rpart and sel_rpart.section then + local rseg = route[sel_rpart.seg] + if rseg then + rseg.call_on = minetest.is_yes(fields.se_callon) + -- reshow form to update CO marker + atil.show_route_edit_form(pname, sigd, routeid, sel_rpart.idx) + return + end + end + if fields.ad_use_rscache then + route.use_rscache = minetest.is_yes(fields.ad_use_rscache) + end + + --if fields.noautogen then + -- route.smartroute_generated = nil + -- route.default_autoworking = nil + -- -- reshow form for the button to disappear + -- atil.show_route_edit_form(pname, sigd, routeid, sel_rpart and sel_rpart.idx) + -- return + --end + if fields.delete then -- if something set the route in the meantime, make sure this doesn't break. atil.route.update_route(sigd, tcbs, nil, true) table.remove(tcbs.routes, routeid) advtrains.interlocking.show_signalling_form(sigd, pname) + -- cleanup + sel_rpartcache[pname] = nil + return + end + + if fields.clone then + -- if something set the route in the meantime, make sure this doesn't break. + atil.route.update_route(sigd, tcbs, nil, true) + local rcopy = table.copy(route) + rcopy.name = route.name.."_copy" + rcopy.smartroute_generated = nil + table.insert(tcbs.routes, routeid+1, rcopy) + advtrains.interlocking.show_signalling_form(sigd, pname) + -- cleanup + sel_rpartcache[pname] = nil + return + end + + if fields.newfrom then + advtrains.interlocking.init_route_prog(pname, sigd, route) + minetest.close_formspec(pname, formname) + tcbs.ars_ignore_next = nil + -- cleanup + sel_rpartcache[pname] = nil + return end if fields.ars and fields.savears then @@ -147,6 +310,25 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.back then advtrains.interlocking.show_signalling_form(sigd, pname) + -- cleanup + sel_rpartcache[pname] = nil + return + end + + -- if an entry was selected in the textlist (and its not the current one) update the form + if fields.routelog then + local prev_idx = sel_rpart and sel_rpart.idx or 1 + local tev = minetest.explode_textlist_event(fields.routelog) + local new_idx = tev and tev.index + if new_idx and new_idx ~= prev_idx then + atil.show_route_edit_form(pname, sigd, routeid, new_idx) + return + end + end + + if fields.quit then + -- cleanup + sel_rpartcache[pname] = nil end end diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua index 67efaea..353b521 100644 --- a/advtrains_interlocking/routesetting.lua +++ b/advtrains_interlocking/routesetting.lua @@ -1,5 +1,8 @@ -- Setting and clearing routes +-- Get current translator +local S = advtrains.interlocking.translate + -- TODO duplicate local lntrans = { "A", "B" } local function sigd_to_string(sigd) @@ -43,59 +46,103 @@ function ilrs.set_route(signal, route, try) local first = true local i = 1 local rtename = route.name - local signalname = ildb.get_tcbs(signal).signal_name + local signalname = (ildb.get_tcbs(signal).signal_name or "") .. sigd_to_string(signal) local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp + -- signals = { { pos = ., tcbs_ref = <tcbs>, role = "main_distant", main_aspect = nil, dst_type = "next_main" or "none" } + local signals = {} + local nodst while c_sigd and i<=#route do c_tcbs = ildb.get_tcbs(c_sigd) if not c_tcbs then if not try then atwarn("Did not find TCBS",c_sigd,"while setting route",rtename,"of",signal) end - return false, "No TCB found at "..sigd_to_string(c_sigd)..". Please reconfigure route!" + return false, S("No TCB found at @1. Please update or reconfigure route!", sigd_to_string(c_sigd)) + end + if i == 1 then + nodst = c_tcbs.nodst end c_ts_id = c_tcbs.ts_id if not c_ts_id then if not try then atwarn("Encountered End-Of-Interlocking while setting route",rtename,"of",signal) end - return false, "No track section adjacent to "..sigd_to_string(c_sigd)..". Please reconfigure route!" + return false, S("No track section adjacent to @1. Please reconfigure route!", sigd_to_string(c_sigd)) end c_ts = ildb.get_ts(c_ts_id) c_rseg = route[i] c_lckp = {} - if c_ts.route then + if not c_ts then + if not try then atwarn("Encountered ts missing during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end + return false, S("Section '@1' not found!", c_ts_id), c_ts_id, nil + elseif c_ts.route then if not try then atwarn("Encountered ts lock during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end - return false, "Section '"..c_ts.name.."' already has route set from "..sigd_to_string(c_ts.route.origin)..":\n"..c_ts.route.rsn, c_ts_id, nil + return false, S("Section '@1' already has route set from @2:", (c_ts.name or c_ts_id), sigd_to_string(c_ts.route.origin)) + .."\n"..c_ts.route.rsn, c_ts_id, nil end if c_ts.trains and #c_ts.trains>0 then - if not try then atwarn("Encountered ts occupied during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end - return false, "Section '"..c_ts.name.."' is occupied!", c_ts_id, nil + if c_rseg.call_on then + --atdebug("Routesetting: Call-on situation in", c_ts_id) + else + if not try then atwarn("Encountered ts occupied during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end + return false, S("Section '@1' is occupied!", (c_ts.name or c_ts_id)), c_ts_id, nil + end + end + + -- collect locks from rs cache and from route def + local c_locks = {} + if route.use_rscache and c_ts.rs_cache and c_rseg.next then + -- rscache needs to be enabled, present and next must be defined + local start_pkey = advtrains.encode_pos(c_sigd.p) + local end_pkey = advtrains.encode_pos(c_rseg.next.p) + if c_ts.rs_cache[start_pkey] and c_ts.rs_cache[start_pkey][end_pkey] then + for lp,lst in pairs(c_ts.rs_cache[start_pkey][end_pkey]) do + --atdebug("Add lock from RSCache:",lp,"->",lst) + c_locks[lp] = lst + end + elseif not try then + atwarn("While setting route",rtename,"of",signal,"segment "..i..",required path from",c_tcbs,"to",c_rseg.next,"was not found in the track section's RS cache. Please check!") + end + end + -- add all from locks, these override the rscache + for lpts,lst in pairs(c_rseg.locks) do + --atdebug("Add lock from Routedef:",lpts,"->",lst,"overrides",c_locks[lpts] or "none") + c_locks[lpts] = lst end - for pts, state in pairs(c_rseg.locks) do - local confl = ilrs.has_route_lock(pts, state) + for lp, state in pairs(c_locks) do + local confl = ilrs.has_route_lock(lp, state) - local pos = minetest.string_to_pos(pts) + local pos = advtrains.decode_pos(lp) if advtrains.is_passive(pos) then local cstate = advtrains.getstate(pos) if cstate ~= state then - local confl = ilrs.has_route_lock(pts) + local confl = ilrs.has_route_lock(lp) if confl then - if not try then atwarn("Encountered route lock while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end - return false, "Lock conflict at "..pts..", Held locked by:\n"..confl, nil, pts + if not try then atwarn("Encountered route lock while a real run of routesetting routine, at position",pos,"while setting route",rtename,"of",signal) end + return false, S("Lock conflict at @1, Held locked by:", minetest.pos_to_string(pos)).."\n"..confl, nil, lp elseif not try then advtrains.setstate(pos, state) end end if not try then - ilrs.add_route_lock(pts, c_ts_id, "Route '"..rtename.."' from signal '"..signalname.."'", signal) - c_lckp[#c_lckp+1] = pts + ilrs.add_route_lock(lp, c_ts_id, S("Route @1 from signal @2", rtename, signalname), signal) + c_lckp[#c_lckp+1] = lp end else if not try then atwarn("Encountered route lock misconfiguration (no passive component) while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end - return false, "No passive component at "..pts..". Please reconfigure route!" + return false, S("Turnout/component missing at @1. Please update track section or reconfigure route!", minetest.pos_to_string(pos)) + end + end + -- sanity check, is section at next the same as the current? + local nvar = c_rseg.next + if nvar then + local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1}) + if (not re_tcbs or not re_tcbs.ts_id or re_tcbs.ts_id~=c_ts_id) + and route[i+1] then --FIX 2025-01-08: in old worlds the final TCB may be wrong (it didn't matter back then), don't error out here (route still shown invalid in UI) + if not try then atwarn("Encountered inconsistent ts (front~=back) while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end + return false, S("TCB at @1 has different section than previous TCB. Please update track section or reconfigure route!", minetest.pos_to_string(nvar.p)) end end -- reserve ts and write locks if not try then - local nvar = c_rseg.next if not route[i+1] then -- We shouldn't use the "next" value of the final route segment, because this can lead to accidental route-cancelling of already set routes from another signal. nvar = nil @@ -103,7 +150,7 @@ function ilrs.set_route(signal, route, try) c_ts.route = { origin = signal, entry = c_sigd, - rsn = "Route '"..rtename.."' from signal '"..signalname.."', segment #"..i, + rsn = S("Route @1 from signal @2, segment #@3", rtename, signalname, i), first = first, } c_ts.route_post = { @@ -112,9 +159,22 @@ function ilrs.set_route(signal, route, try) } if c_tcbs.signal then c_tcbs.route_committed = true - c_tcbs.aspect = route.aspect or advtrains.interlocking.GENERIC_FREE c_tcbs.route_origin = signal - advtrains.interlocking.update_signal_aspect(c_tcbs) + -- determine route role + local ndef = advtrains.ndb.get_ndef(c_tcbs.signal) + local assign_dst = c_rseg.assign_dst + if assign_dst == nil then + assign_dst = (i~=1) -- special behavior when assign_dst is nil (and not false): + -- defaults to false for the very first signal and true for all others (= minimal user configuration overhead) + end + local sig_table = { + pos = c_tcbs.signal, + tcbs_ref = c_tcbs, + role = ndef and ndef.advtrains and ndef.advtrains.route_role, + main_aspect = c_rseg.main_aspect, + assign_dst = assign_dst + } + signals[#signals+1] = sig_table end end -- advance @@ -122,10 +182,47 @@ function ilrs.set_route(signal, route, try) c_sigd = c_rseg.next i = i + 1 end + + -- Get reference to signal at end of route + local last_mainsig = nil + if c_sigd then + local e_tcbs = ildb.get_tcbs(c_sigd) + local pos = e_tcbs and e_tcbs.signal + if pos then + last_mainsig = pos + end + end + for i = #signals, 1, -1 do + -- note the signals are iterated backwards. Switch depending on the role + local sig = signals[i] + -- apply mainaspect + sig.tcbs_ref.route_aspect = sig.main_aspect or "_default" -- or route.main_aspect : TODO this does not work if a distant signal is on the path! Implement per-sig aspects! + if sig.role == "distant" or sig.role == "distant_repeater" or sig.role == "main_distant" then + if last_mainsig then + -- assign the remote as the last mainsig if desired + if sig.assign_dst then + sig.tcbs_ref.route_remote = last_mainsig + end + -- if it wasn't a distant_repeater clear the mainsig + if sig.role ~= "distant_repeater" then + last_mainsig = false + end + end + end + if sig.role == "main" or sig.role == "main_distant" or sig.role == "end" then + -- record this as the new last mainsig + last_mainsig = sig.pos + end + -- for shunt signals nothing happens + -- update the signal aspect on map + advtrains.interlocking.signal.update_route_aspect(sig.tcbs_ref, i ~= 1) + end return true end +-- Change 2024-01-27: pts is not an encoded pos, not a pos-to-string! + -- Checks whether there is a route lock that prohibits setting the component -- to the wanted state. returns string with reasons on conflict function ilrs.has_route_lock(pts) @@ -172,6 +269,11 @@ function ilrs.free_route_locks(ts, lcks, nocallbacks) end function ilrs.free_route_locks_indiv(pts, ts, nocallbacks) + -- legacy: if starts with bracket then pts is still in old pos_to_string format (may happen because ts.route_post is not migrated) + if string.match(pts, "^%(") then + atdebug("free_route_locks_indiv: converting position",pts) + pts = advtrains.encode_pos(minetest.string_to_pos(pts)) + end local e = ilrs.rte_locks[pts] if not e then return nil elseif #e==0 then @@ -191,7 +293,7 @@ function ilrs.free_route_locks_indiv(pts, ts, nocallbacks) -- TODO use luaautomation timers? if not nocallbacks then minetest.after(0, ilrs.update_waiting, "lck", pts) - minetest.after(0.5, advtrains.set_fallback_state, minetest.string_to_pos(pts)) + minetest.after(0.5, advtrains.set_fallback_state, advtrains.decode_pos(pts)) end end -- frees all route locks, even manual ones set with the tool, at a specific position @@ -224,12 +326,13 @@ function ilrs.cancel_route_from(sigd) --atdebug("cancelling",c_ts.route.rsn) -- clear signal aspect and routesetting state c_tcbs.route_committed = nil - c_tcbs.aspect = nil + c_tcbs.route_aspect = nil + c_tcbs.route_remote = nil c_tcbs.routeset = nil c_tcbs.route_auto = nil c_tcbs.route_origin = nil - advtrains.interlocking.update_signal_aspect(c_tcbs) + advtrains.interlocking.signal.update_route_aspect(c_tcbs) c_ts_id = c_tcbs.ts_id if not c_tcbs then @@ -264,7 +367,7 @@ end -- route setting -- Call this function to set and cancel routes! -- sigd, tcbs: self-explanatory --- newrte: If a new route should be set, the route index of it (in tcbs.routes). nil otherwise +-- newrte: If a new route should be set, the route index of it (in tcbs.routes). Can also be a table (multi-ars). nil otherwise -- cancel: true in combination with newrte=nil causes cancellation of the current route. function ilrs.update_route(sigd, tcbs, newrte, cancel) --atdebug("Update_Route for",sigd,tcbs.signal_name) @@ -273,47 +376,90 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel) --atdebug("Signal not in control, held by",tcbs.signal_name) return end + -- clear route_rsn, it will be set again if needed + tcbs.route_rsn = nil if (newrte and tcbs.routeset and tcbs.routeset ~= newrte) or cancel then if tcbs.route_committed then --atdebug("Cancelling:",tcbs.routeset) advtrains.interlocking.route.cancel_route_from(sigd) end tcbs.route_committed = nil - tcbs.aspect = nil + tcbs.route_aspect = nil + tcbs.route_remote = nil has_changed_aspect = true tcbs.routeset = nil tcbs.route_auto = nil - tcbs.route_rsn = nil end if newrte or tcbs.routeset then if tcbs.route_committed then return end - if newrte then tcbs.routeset = newrte end - --atdebug("Setting:",tcbs.routeset) - local succ, rsn, cbts, cblk = ilrs.set_route(sigd, tcbs.routes[tcbs.routeset]) - if not succ then - tcbs.route_rsn = rsn - --atdebug("Routesetting failed:",rsn) - -- add cbts or cblk to callback table - if cbts then - --atdebug("cbts =",cbts) - if not ilrs.rte_callbacks.ts[cbts] then ilrs.rte_callbacks.ts[cbts]={} end - advtrains.insert_once(ilrs.rte_callbacks.ts[cbts], sigd, sigd_equal) + if newrte then + if type(newrte)=="table" and not next(newrte) then + error("update_route got multi-ARS with empty table, this is not allowed") end - if cblk then - --atdebug("cblk =",cblk) - if not ilrs.rte_callbacks.lck[cblk] then ilrs.rte_callbacks.lck[cblk]={} end - advtrains.insert_once(ilrs.rte_callbacks.lck[cblk], sigd, sigd_equal) + tcbs.routeset = newrte + else + if type(tcbs.routeset)=="table" and not next(tcbs.routeset) then + -- just unset, don't error + atwarn(sigd, "had multi-ARS route set with empty list! Cancelled!") + tcbs.routeset = nil + return end + end + --atdebug("Setting:",tcbs.routeset) + -- check: single-ars or multi-ars? + local multi_rte + if type(tcbs.routeset) == "table" then + multi_rte = tcbs.routeset else - --atdebug("Committed Route:",tcbs.routeset) - has_changed_aspect = true + multi_rte = {tcbs.routeset} + end + for multi_idx, rteid in ipairs(multi_rte) do + local succ, rsn, cbts, cblk + local route = tcbs.routes[rteid] + if route then + succ, rsn, cbts, cblk = ilrs.set_route(sigd, route) + else + succ = false + rsn = attrans("Route with index @1 not found", rteid) + end + if not succ then + if multi_idx==1 then + tcbs.route_rsn = rsn + else + tcbs.route_rsn = (tcbs.route_rsn or "").."\n"..rsn + end + --atdebug("Routesetting",rteid,"failed:",rsn,"(multi-idx",multi_idx,")") + -- add cbts or cblk to callback table + if cbts then + --atdebug("cbts =",cbts) + if not ilrs.rte_callbacks.ts[cbts] then ilrs.rte_callbacks.ts[cbts]={} end + advtrains.insert_once(ilrs.rte_callbacks.ts[cbts], sigd, sigd_equal) + end + if cblk then + --atdebug("cblk =",cblk) + if not ilrs.rte_callbacks.lck[cblk] then ilrs.rte_callbacks.lck[cblk]={} end + advtrains.insert_once(ilrs.rte_callbacks.lck[cblk], sigd, sigd_equal) + end + else + --atdebug("Committed Route:",rteid,"(multi-idx",multi_idx,")") + -- replace multi_route by single actually committed route + tcbs.routeset = rteid + -- set_route now sets the signal aspects + --has_changed_aspect = true + -- route success. apply default_autoworking flag if requested + if route.default_autoworking then + tcbs.route_auto = true --FIX 2025-01-08: never set it to false if it was true! + end + -- break out of the for loop, dont try any more routes + break + end end end if has_changed_aspect then -- FIX: prevent an minetest.after() loop caused by update_signal_aspect dispatching path invalidation, which in turn calls ARS again - advtrains.interlocking.update_signal_aspect(tcbs) + advtrains.interlocking.signal.update_route_aspect(tcbs) end advtrains.interlocking.update_player_forms(sigd) end diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua index a44eda6..e7c2248 100644 --- a/advtrains_interlocking/signal_api.lua +++ b/advtrains_interlocking/signal_api.lua @@ -1,515 +1,479 @@ -- Signal API implementation +local F = advtrains.formspec ---[[ -Signal aspect table: -Note: All speeds are measured in m/s, aka the number of + signs in the HUD. -asp = { - main = <int speed>, - -- Main signal aspect, tells state and permitted speed of next section - -- 0 = section is blocked - -- >0 = section is free, speed limit is this value - -- -1 = section is free, maximum speed permitted - -- false/nil = Signal doesn't provide main signal information, retain current speed limit. - shunt = <boolean>, - -- Whether train may proceed as shunt move, on sight - -- main aspect takes precedence over this - -- When main==0, train switches to shunt move and is restricted to speed 6 - proceed_as_main = <boolean>, - -- If an approaching train is a shunt move and 'shunt' is false, - -- the train may proceed as a train move under the "main" aspect - -- if the main aspect permits it (i.e. main!=0) - -- If this is not set, shunt moves are NOT allowed to switch to - -- a train move, and must stop even if "main" would permit passing. - -- This is intended to be used for "Halt for shunt moves" signs. - - dst = <int speed>, - -- Distant signal aspect, tells state and permitted speed of the section after next section - -- The character of these information is purely informational - -- At this time, this field is not actively used - -- 0 = section is blocked - -- >0 = section is free, speed limit is this value - -- -1 = section is free, maximum speed permitted - -- false/nil = Signal doesn't provide distant signal information. - - -- the character of call_on and dead_end is purely informative - call_on = <boolean>, -- Call-on route, expect train in track ahead (not implemented yet) - dead_end = <boolean>, -- Route ends on a dead end (e.g. bumper) (not implemented yet) - - w_speed = <integer>, - -- "Warning speed restriction". Supposed for short-term speed - -- restrictions which always override any other restrictions - -- imposed by "speed" fields, until lifted by a value of -1 - -- (Example: german Langsamfahrstellen-Signale) - } -} - -== How signals actually work in here == -Each signal (in the advtrains universe) is some node that has at least the -following things: -- An "influence point" that is set somewhere on a rail -- An aspect which trains that pass the "influence point" have to obey +local signal = {} -There can be static and dynamic signals. Static signals are, roughly -spoken, signs, while dynamic signals are "real" signals which can display -different things. - -The node definition of a signal node should contain those fields: -groups = { - advtrains_signal = 2, - save_in_at_nodedb = 1, +signal.MASP_HALT = { + name = "_halt", + halt = true, } -advtrains = { - set_aspect = function(pos, node, asp) - -- This function gets called whenever the signal should display - -- a new or changed signal aspect. It is not required that - -- the signal actually displays the exact same aspect, since - -- some signals can not do this by design. However, it must - -- display an aspect that is at least as restrictive as the passed - -- aspect as far as it is capable of doing so. - -- Examples: - -- - pure shunt signals can not display a "main" aspect - -- and have no effect on train moves, so they will only ever - -- honor the shunt.free field for their aspect. - -- - the german Hl system can only signal speeds of 40, 60 - -- and 100 km/h, a speed of 80km/h should then be signalled - -- as 60 km/h instead. - -- In turn, it is not guaranteed that the aspect will fulfill the - -- criteria put down in supported_aspects. - -- If set_aspect is present, supported_aspects should also be declared. - - -- The aspect passed in here can always be queried using the - -- advtrains.interlocking.signal_get_supposed_aspect(pos) function. - -- It is always DANGER when the signal is not used as route signal. - - -- For static signals, this function should be completely omitted - -- If this function is omitted, it won't be possible to use - -- route setting on this signal. - end, - supported_aspects = { - -- A table which tells which different types of aspects this signal - -- is able to display. It is used to construct the "aspect editing" - -- formspec for route programming (and others) It should always be - -- present alongside with set_aspect. If this is not specified but - -- set_aspect is, the user will be allowed to select any aspect. - -- Any of the fields marked with <boolean/nil> support 3 types of values: - nil: if this signal can switch between free/blocked - false: always shows "blocked", unchangable - true: always shows "free", unchangable - -- Any of the "speed" fields should contain a list of possible values - -- to be set as restriction. If omitted, the value of the described - -- field is always assumed to be false (no information) - -- A speed of 0 means that the signal can show a "blocked" aspect - -- (which is probably the case for most signals) - -- If the signal can signal "no information" on one of the fields - -- (thus false is an acceptable value), include false in the list - -- If your signal can only display a single speed (may it be -1), - -- always enclose that single value into a list. (such as {-1}) - main = {<speed1>, ..., <speedn>} or nil, - dst = {<speed1>, ..., <speedn>} or nil, - shunt = <boolean/nil>, - - call_on = <boolean/nil>, - dead_end = <boolean/nil>, - w_speed = {<speed1>, ..., <speedn>} or nil, - - }, - Example for supported_aspects: - supported_aspects = { - main = {0, 6, -1}, -- can show either "Section blocked", "Proceed at speed 6" or "Proceed at maximum speed" - dst = {0, false}, -- can show only if next signal shows "blocked", no other information. - shunt = false, -- shunting by this signal is never allowed. - - call_on = false, - dead_end = false, - w_speed = nil, - -- none of the information can be shown by the signal - - }, - - get_aspect = function(pos, node) - -- This function gets called by the train safety system. It - should return the aspect that this signal actually displays, - not preferably the input of set_aspect. - -- For regular, full-featured light signals, they will probably - honor all entries in the original aspect, however, e.g. - simple shunt signals always return main=false regardless of - the set_aspect input because they can not signal "Halt" to - train moves. - -- advtrains.interlocking.DANGER contains a default "all-danger" aspect. - -- If your signal does not cover certain sub-tables of the aspect, - the following reasonable defaults are automatically assumed: - main = false (unchanged) - dst = false (unchanged) - shunt = false (shunting not allowed) - info = {} (no further information) - end, + +signal.MASP_DEFAULT = { + name = "_default", + default = true, } -on_rightclick = advtrains.interlocking.signal_rc_handler -can_dig = advtrains.interlocking.signal_can_dig -after_dig_node = advtrains.interlocking.signal_after_dig - -(If you need to specify custom can_dig or after_dig_node callbacks, -please call those functions anyway!) - -Important note: If your signal should support external ways to set its -aspect (e.g. via mesecons), there are some things that need to be considered: -- advtrains.interlocking.signal_get_supposed_aspect(pos) won't respect this -- Whenever you change the signal aspect, and that aspect change -did not happen through a call to -advtrains.interlocking.signal_set_aspect(pos, asp), you are -*required* to call this function: -advtrains.interlocking.signal_on_aspect_changed(pos) -in order to notify trains about the aspect change. -This function will query get_aspect to retrieve the new aspect. - -]]-- - -local DANGER = { + +signal.ASPI_HALT = { main = 0, - dst = false, shunt = false, } -advtrains.interlocking.DANGER = DANGER -advtrains.interlocking.GENERIC_FREE = { +signal.ASPI_FREE = { main = -1, shunt = false, - dst = false, + proceed_as_main = true, } -local function convert_aspect_if_necessary(asp) - if type(asp.main) == "table" then - local newasp = {} - if asp.main.free then - newasp.main = asp.main.speed - else - newasp.main = 0 - end - if asp.dst and asp.dst.free then - newasp.dst = asp.dst.speed - else - newasp.dst = 0 +--[[ +Implementation plan orwell 2024-01-28: +Most parts of ywang's implementation are fine, especially I like the formspecs. But I would like to change a few aspects (no pun intended) of this. +- Signal gets distant assigned via field in signal aspect table (instead of explicitly) +- Signal speed/shunt are no longer free-text but rather they need to be predefined in the node definition +To do this: Differentiation between: +== Main Aspect == +This is what a signal is assigned by either the route system or the user. +It is a string key which has an appropriate entry in the node definition (where it has a description assigned) +The signal mod defines a function to set a signal to the most appropriate aspect. This function gets +a) the main aspect table (straight from node def) +b) the distant signal's aspect group name & aspect table + +== Aspect == +One concrete combination of lights/shapes that a signal signal shows. Handling these is at the discretion of +the signal mod defining the signal, and they are typically combinations of main aspect and distant aspect +Example: +- A Ks signal has the main_aspect="proceed_12" set for a route +- The signal at the end of the route shows main_aspect="proceed_8", advtrains also passes on that this means {main=8, shunt=false} +- The ndef.afunction(pos, node, main_aspect, rem_aspect, rem_aspinfo) determines that the signal should now show + blinking green with main indicator 12 and dst indicator 8, and sets the nodes accordingly. + This function can now return the Aspect Info table, which will be cached by advtrains until the aspect changes again + and will be used when a train approaches the signal. If nil is returned, then the aspect will be queried next time + by calling ndef.advtrains.get_aspect_info(pos) + +Note that once apply_aspect returns, there is no need for advtrains anymore to query the aspect info. +When the signal, for any reason, wants to change its aspect by itself *without* going through the signal API then +it should update the aspect info cache by calling advtrains.interlocking.signal.update_aspect_info(pos) + +Apply_aspect may also receive the special main aspect { name = "_halt", halt = true }. It usually means that the signal is not assigned to anything particular, +and it should cause the signal to show its most restrictive aspect. Typically it is a halt aspect, but e.g. for distant-only +signals this would be "expect stop". + +A special case occurs for pure distant signals: Such signals must set apply_aspect, but must not set main_aspects. Behavior is as follows: +- Signal is uninitialized, distant signal is not assigned to a main signal, or no route is set: main_aspect == { name = "_halt", halt = true } and rem_aspect == nil +- A remote main signal is assigned (either by user or by route): main_aspect is always { name = "_default" } and rem_aspect / rem_aspinfo give the correct information + +Main aspect names starting with underscore (e.g. "_default") are reserved and must not be used! + +== Aspect Info == +The actual signal aspect in the already-known format. This is what the trains use to determine halt/proceed and speed. +asp = { + main = 0 (halt) / -1 (max speed) / false (no info) / <number> (speed limit) + shunt = true (shunt free) / false (shunt not free) + proceed_as_main = true (shunt move can proceed and become train move when main!=0) / false (no) + dst = speed of the remote signal (like main, informative character, not actually used) +} + +Node definition of signals: +- The signal needs some logic to figure out, for each combination of its own aspect group and the distant signal's aspect, what aspect info it can/will show. +ndef.advtrains = { + main_aspects = { + { name = "proceed" description = "Proceed at full speed", <more data at discretion of signal>} + { name = "reduced" description = "Proceed at reduced speed", <more data at discretion of signal>} + } + -- This list is mainly for the selection dialog. Order of entries determines list order in the dropdown. + -- Some fields have special meaning: + -- name: A unique key to identify the main aspect. Might be required by some code. + -- description: Text shown in UI dropdown + -- Node can set any other fields at its discretion. They are not touched. + -- Note: Pure distant signals should set one main aspect, and set the "pure_distant = true" field + apply_aspect = function(pos, node, main_aspect, rem_aspect, rem_aspinfo) + -- set the node to show the desired aspect + -- called by advtrains when this signal's aspect group or the remote signal's aspect changes + -- main_aspect is never nil, but can be the special aspect { name = "_halt", halt = true } + -- MAY return the aspect_info. If it returns nil then get_aspect_info will be queried at a later point. + get_aspect_info(pos, main_aspect) + -- Returns the aspect info table (main, shunt, dst etc.) + distant_support = true or false + -- If true, signal is considered in distant signalling. If false or nil, rem_aspect and rem_aspinfo are never set. + route_role = one of "main", "main_distant", "shunt", "distant", "distant_repeater", "end" + -- Determines how the signal behaves when routes are set. Only in effect when signal is assigned to a TCB. + -- main: The signal is a possible endpoint for a train move route. Distant signals before it refer to it. + -- shunt: The signal is a possible endpoint for a shunt move route. Ignored for distant signals. + -- distant, distant_repeater: The next signal with role="main" is set as the remote signal. main_aspects may be undefined, the main aspect passed to apply_aspect is a dummy one in this case. + -- distant: if more than one distant signal is before a main signal, only the last one is assigned (but any number of distant_repeater signals are allowed) + -- main_distant: Combination of main and distant - like "main", but additionally gets assigned to the next main like a "distant" + -- end: like main, but signifies that it marks an end of track and trains cannot continue further. (currently no practical implications above main) + pure_distant = true / false + -- If true, this signal is assumed to be a pure distant signal (its halt aspect is rather "expect halt" and it cannot show a true "stop here") + -- The following special behavior applies when this signal is assigned to a TCB: When a train passes the signal, the aspect is not reset to the + -- halt aspect and it continues to announce the remote signal's aspect (like in real life) + -- Typically such signals have one main aspect, their appearance depends almost exclusively on their remote signal and the halt aspect is the same as + -- the aspect shown when the main aspect is set but the remote signal is at halt. +} + +== Nomenclature == +The distant/main relation is named as follows: + V M +=====>====> +Main signal (main) always refers to the signal that is in focus right now (even if that is a distant-only signal) +From the standpoint of M, V is the distant (dst) signal. M does not need to concern itself with V's aspect but needs to notify V when it changes +From the standpoint of V, M is the remote (rem) signal. V needs to show an aspect that matches its remote signal M + +== Criteria for which signals are eligible for routes == + +All signals must define: +- get_aspect_info() + +Signals that can be assigned to a TCB must satisfy: +- apply_aspect() defined + +Signals that are possible start and end points for a route must satisfy: +- main_aspects defined (note, pure distant signals should therefore not define main_aspects) + +]] + +-- Database +-- Signal Aspect store +-- Stores for each signal the main aspect and other info, like the assigned remote signal +-- [signal encodePos] = { main = <table or string>, [remote = encodedPos] } +-- main is a string: "named aspect" is looked up in the main_aspects table of the ndef +-- main is a table: this table directly is the main aspect (used for advanced signals with additional lights/indicators) +signal.aspects = {} + +-- Distant signal notification. Records for each signal the distant signals that refer to it +-- Note: this mapping is weak. Needs always backreference check. +-- [signal encodePos] = { [distant signal encodePos] = true } +signal.distant_refs = {} + +function signal.load(data) + signal.aspects = data.aspects or {} + -- rebuild distant_refs after load + signal.distant_refs = {} + for main, aspt in pairs(signal.aspects) do + if aspt.remote then + if not signal.distant_refs[aspt.remote] then + signal.distant_refs[aspt.remote] = {} + end + signal.distant_refs[aspt.remote][main] = true end - newasp.proceed_as_main = asp.shunt.proceed_as_main - newasp.shunt = asp.shunt.free - -- Note: info table not transferred, it's not used right now - return newasp end - return asp end -function advtrains.interlocking.update_signal_aspect(tcbs) - if tcbs.signal then - local asp = tcbs.aspect or DANGER - advtrains.interlocking.signal_set_aspect(tcbs.signal, asp) - end +function signal.save(data) + data.aspects = signal.aspects end -function advtrains.interlocking.signal_can_dig(pos) - return not advtrains.interlocking.db.get_sigd_for_signal(pos) -end -function advtrains.interlocking.signal_after_dig(pos) - -- clear influence point - advtrains.interlocking.db.clear_ip_by_signalpos(pos) +-- Set a signal's aspect. +-- Signal aspects should only be set through this function. It takes care of: +-- - Storing the main aspect and dst pos for this signal permanently (until next change) +-- - Assigning the distant signal for this signal +-- - Calling apply_aspect() in the signal's node definition to make the signal show the aspect +-- - Calling apply_aspect() again whenever the remote signal changes its aspect +-- - Notifying this signal's distant signals about changes to this signal (unless skip_dst_notify is specified) +-- main_asp: either a string (==name in ndef.advtrains.main_aspects) or the main aspect table directly (for advanced signals) +function signal.set_aspect(pos, main_asp, rem_pos, skip_dst_notify) + -- safeguard for the two integrated aspects (these two must be passed as string key) + if type(main_asp)=="table" and (main_asp.name=="_default" or main_asp.name=="_halt") then + error("MASP_HALT and MASP_DEFAULT must be passed via string keys _halt or _default, not as tables!") + end + local main_pts = advtrains.encode_pos(pos) + local old_tbl = signal.aspects[main_pts] + local old_remote = old_tbl and old_tbl.remote + local new_remote = rem_pos and advtrains.encode_pos(rem_pos) + + -- if remote has changed, unregister from old remote + if old_remote and old_remote~=new_remote and signal.distant_refs[old_remote] then + --atdebug("unregister old remote: ",old_remote,"from",main_pts) + signal.distant_refs[old_remote][main_pts] = nil + end + + signal.aspects[main_pts] = { main = main_asp, remote = new_remote } + -- apply aspect on main signal, this also checks new_remote + signal.reapply_aspect(main_pts) + + -- notify my distants about this change (with limit 2) + if not skip_dst_notify then + signal.notify_distants_of(main_pts, 2) + end end -function advtrains.interlocking.signal_set_aspect(pos, asp) - asp = convert_aspect_if_necessary(asp) - local node=advtrains.ndb.get_node(pos) - local ndef=minetest.registered_nodes[node.name] - if ndef and ndef.advtrains and ndef.advtrains.set_aspect then - ndef.advtrains.set_aspect(pos, node, asp) - advtrains.interlocking.signal_on_aspect_changed(pos) +function signal.clear_aspect(pos, skip_dst_notify) + local main_pts = advtrains.encode_pos(pos) + local old_tbl = signal.aspects[main_pts] + local old_remote = old_tbl and old_tbl.remote + + -- unregister from old remote + if old_remote then + signal.distant_refs[old_remote][main_pts] = nil + end + + signal.aspects[main_pts] = nil + -- apply aspect on main signal, this also checks new_remote + signal.reapply_aspect(main_pts) + + -- notify my distants about this change (with limit 2) + if not skip_dst_notify then + signal.notify_distants_of(main_pts, 2) end end --- should be called when aspect has changed on this signal. -function advtrains.interlocking.signal_on_aspect_changed(pos) - local ipts, iconn = advtrains.interlocking.db.get_ip_by_signalpos(pos) - if not ipts then return end - local ipos = minetest.string_to_pos(ipts) +-- Clear any info about aspects from this signal, without resetting/reapplying the aspect. +-- Supposed to be used for legacy on-off signals when the on-off toggle is used +function signal.unregister_aspect(pos) + local main_pts = advtrains.encode_pos(pos) + local old_tbl = signal.aspects[main_pts] + local old_remote = old_tbl and old_tbl.remote - advtrains.invalidate_all_paths_ahead(ipos) + -- unregister from old remote + if old_remote then + signal.distant_refs[old_remote][main_pts] = nil + end + + signal.aspects[main_pts] = nil end -function advtrains.interlocking.signal_rc_handler(pos, node, player, itemstack, pointed_thing) - local pname = player:get_player_name() - local control = player:get_player_control() - if control.aux1 then - advtrains.interlocking.show_ip_form(pos, pname) +-- Notify distant signals of main_pts of a change in the aspect of this signal +-- +function signal.notify_distants_of(main_pts, limit) + --atdebug("notify_distants_of",advtrains.decode_pos(main_pts),"limit",limit) + if limit <= 0 then return end - - local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos) - if sigd then - advtrains.interlocking.show_signalling_form(sigd, pname) - else - local ndef = minetest.registered_nodes[node.name] - if ndef.advtrains and ndef.advtrains.set_aspect then - -- permit to set aspect manually - local function callback(pname, aspect) - advtrains.interlocking.signal_set_aspect(pos, aspect) + local dstrefs = signal.distant_refs[main_pts] + --atdebug("dstrefs",dstrefs,"") + if dstrefs then + for dst,_ in pairs(dstrefs) do + -- ensure that the backref is still valid + local dst_asp = signal.aspects[dst] + if dst_asp and dst_asp.remote == main_pts then + signal.reapply_aspect(dst) + signal.notify_distants_of(dst, limit - 1) + else + atwarn("Distant signal backref is not purged: main =",main_pts,", distant =",dst,", remote =",dst_asp.remote,"") end - local isasp = ndef.advtrains.get_aspect(pos, node) - - advtrains.interlocking.show_signal_aspect_selector( - pname, - ndef.advtrains.supported_aspects, - "Set aspect manually", callback, - isasp) - else - --static signal - only IP - advtrains.interlocking.show_ip_form(pos, pname) end end end --- Returns the aspect the signal at pos is supposed to show -function advtrains.interlocking.signal_get_supposed_aspect(pos) - local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos) - if sigd then - local tcbs = advtrains.interlocking.db.get_tcbs(sigd) - if tcbs.aspect then - return convert_aspect_if_necessary(tcbs.aspect) - end - end - return DANGER; +function signal.notify_trains(pos) + local ipts, iconn = advtrains.interlocking.db.get_ip_by_signalpos(pos) + if not ipts then return end + local ipos = minetest.string_to_pos(ipts) + + -- FIXME: invalidate_all_paths_ahead does not appear to always work as expected + --advtrains.invalidate_all_paths_ahead(ipos) + minetest.after(0, advtrains.invalidate_all_paths, ipos) end --- Returns the actual aspect of the signal at position, as returned by the nodedef. --- returns nil when there's no signal at the position -function advtrains.interlocking.signal_get_aspect(pos) - local node=advtrains.ndb.get_node(pos) - local ndef=minetest.registered_nodes[node.name] - if ndef and ndef.advtrains and ndef.advtrains.get_aspect then - local asp = ndef.advtrains.get_aspect(pos, node) - if not asp then asp = DANGER end - return convert_aspect_if_necessary(asp) +-- Update waiting trains and distant signals about a changed signal aspect +-- Must be called when a signal's aspect changes through some other means +-- and not via the signal mechanism +function signal.notify_on_aspect_changed(pos, skip_dst_notify) + signal.notify_trains(pos) + if not skip_dst_notify then + signal.notify_distants_of(advtrains.encode_pos(pos), 2) end - return nil end --- Returns the "supported_aspects" of the signal at position, as returned by the nodedef. --- returns nil when there's no signal at the position -function advtrains.interlocking.signal_get_supported_aspects(pos) - local node=advtrains.ndb.get_node(pos) - local ndef=minetest.registered_nodes[node.name] - if ndef and ndef.advtrains and ndef.advtrains.supported_aspects then - local asp = ndef.advtrains.supported_aspects - return asp - end - return nil +-- Gets the stored main aspect and distant signal position for this signal +-- This information equals the information last passed to set_aspect +-- It does not take into consideration the actual speed signalling, please use +-- get_aspect_info() for this +-- pos: the position of the signal +-- returns: main_aspect, dst_pos +function signal.get_aspect(pos) + local aspt = signal.aspects[advtrains.encode_pos(pos)] + local ma,dp = signal.get_aspect_internal(pos, aspt) + return ma, dp and advtrains.decode_pos(dp) +end + +local function cache_mainaspects(ndefat) + ndefat.main_aspects_lookup = {} + for _,ma in ipairs(ndefat.main_aspects) do + ndefat.main_aspects_lookup[ma.name] = ma + end + ndefat.main_aspects_lookup[signal.MASP_HALT.name] = signal.MASP_HALT.name -- halt is always defined + ndefat.main_aspects_lookup[signal.MASP_DEFAULT.name] = ndefat.main_aspects[1] -- default is the first one end -local players_assign_ip = {} -local function ipmarker(ipos, connid) - local node_ok, conns, rhe = advtrains.get_rail_info_at(ipos, advtrains.all_tracktypes) - if not node_ok then return end - local yaw = advtrains.dir_to_angle(conns[connid].c) +-- gets the main aspect. resolves named aspects to aspect table on demand +function signal.get_aspect_internal(pos, aspt) + -- look up node and nodedef + local node = advtrains.ndb.get_node_or_nil(pos) + local ndef = node and minetest.registered_nodes[node.name] + if not aspt then + -- oh, no main aspect, nevermind + return signal.MASP_HALT, nil, node, ndef + end + local ndefat = ndef.advtrains or {} + local masp = aspt.main or signal.MASP_HALT - -- using tcbmarker here - local obj = minetest.add_entity(vector.add(ipos, {x=0, y=0.2, z=0}), "advtrains_interlocking:tcbmarker") - if not obj then return end - obj:set_yaw(yaw) - obj:set_properties({ - textures = { "at_il_signal_ip.png" }, - }) + if type(masp) == "string" then + if masp=="_halt" then + masp = signal.MASP_HALT + elseif masp=="_default" and not ndefat.main_aspects then + -- case is fine, distant only signal + masp = signal.MASP_DEFAULT + else + assert(ndefat.main_aspects, "With named aspects, node "..node.name.." needs advtrains.main_aspects table!") + -- resolve the main aspect from the mainaspects table + if not ndefat.main_aspects_lookup then + cache_mainaspects(ndefat) + end + masp = ndefat.main_aspects_lookup[aspt.main] or signal.MASP_DEFAULT + end + end + -- return whatever the main aspect is + return masp, aspt.remote, node, ndef end --- shows small info form for signal IP state/assignment --- only_notset: show only if it is not set yet (used by signal tcb assignment) -function advtrains.interlocking.show_ip_form(pos, pname, only_notset) - if not minetest.check_player_privs(pname, "interlocking") then - return - end - local form = "size[7,5]label[0.5,0.5;Signal at "..minetest.pos_to_string(pos).."]" - local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos) - if pts then - form = form.."label[0.5,1.5;Influence point is set at "..pts.."/"..connid.."]" - form = form.."button_exit[0.5,2.5; 5,1;set;Move]" - form = form.."button_exit[0.5,3.5; 5,1;clear;Clear]" - local ipos = minetest.string_to_pos(pts) - ipmarker(ipos, connid) - else - form = form.."label[0.5,1.5;Influence point is not set.]" - form = form.."label[0.5,2.0;It is recommended to set an influence point.]" - form = form.."label[0.5,2.5;This is the point where trains will obey the signal.]" +-- For the signal at pos, get the "aspect info" table. This contains the speed signalling information at this location +function signal.get_aspect_info(pos) + -- get aspect internal + local aspt = signal.aspects[advtrains.encode_pos(pos)] + local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt) + -- call into ndef + if ndef and ndef.advtrains and ndef.advtrains.get_aspect_info then + local ai = ndef.advtrains.get_aspect_info + if type(ai)=="function" then + ai = ai(pos, masp) + end + if type(ai)=="table" then + --atdebug(pos,"aspectinfo",ai) + return ai + else + error("For node "..node.name..": ndef.advtrains.get_aspect_info must be function or table") + end - form = form.."button_exit[0.5,3.5; 5,1;set;Set]" - end - if not only_notset or not pts then - minetest.show_formspec(pname, "at_il_ipassign_"..minetest.pos_to_string(pos), form) end end -minetest.register_on_player_receive_fields(function(player, formname, fields) - local pname = player:get_player_name() - if not minetest.check_player_privs(pname, {train_operator=true, interlocking=true}) then - return - end - local pts = string.match(formname, "^at_il_ipassign_([^_]+)$") - local pos - if pts then - pos = minetest.string_to_pos(pts) - end - if pos then - if fields.set then - advtrains.interlocking.signal_init_ip_assign(pos, pname) - elseif fields.clear then - advtrains.interlocking.db.clear_ip_by_signalpos(pos) + +-- Called when either this signal has changed its main aspect +-- or when this distant signal's currently assigned main signal has changed its aspect +-- It retrieves the signal's main aspect and aspect info and calls apply_aspect of the node definition +-- to update the signal's appearance and aspect info +-- pts: The signal position to update as encoded_pos +-- returns: the return value of the nodedef call which may be aspect_info +function signal.reapply_aspect(pts) + -- get aspt + local aspt = signal.aspects[pts] + --atdebug("reapply_aspect",advtrains.decode_pos(pts),"aspt",aspt) + local pos = advtrains.decode_pos(pts) + -- resolve mainaspect table by name + local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt) + -- if we have remote, resolve remote + local rem_masp, rem_aspi + if remote then + -- register in remote signal as distant + if not signal.distant_refs[remote] then + signal.distant_refs[remote] = {} + end + signal.distant_refs[remote][pts] = true + local rem_aspt = signal.aspects[remote] + --atdebug("resolving remote",advtrains.decode_pos(remote),"aspt",rem_aspt) + local rem_pos = advtrains.decode_pos(remote) + local _,rem_ndef + rem_masp, _, _, rem_ndef = signal.get_aspect_internal(rem_pos, rem_aspt) + if rem_masp then + if rem_ndef.advtrains and rem_ndef.advtrains.get_aspect_info then + rem_aspi = rem_ndef.advtrains.get_aspect_info(rem_pos, rem_masp) + end end end -end) - --- inits the signal IP assignment process -function advtrains.interlocking.signal_init_ip_assign(pos, pname) - if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") - return + -- call into ndef + --atdebug("applying to",pos,": main_asp",masp,"rem_masp",rem_masp,"rem_aspi",rem_aspi) + if ndef.advtrains and ndef.advtrains.apply_aspect then + ndef.advtrains.apply_aspect(pos, node, masp, rem_masp, rem_aspi) end - --remove old IP - --advtrains.interlocking.db.clear_ip_by_signalpos(pos) - minetest.chat_send_player(pname, "Configuring Signal: Please look in train's driving direction and punch rail to set influence point.") - - players_assign_ip[pname] = pos + -- notify trains + signal.notify_trains(pos) end -minetest.register_on_punchnode(function(pos, node, player, pointed_thing) - local pname = player:get_player_name() - if not minetest.check_player_privs(pname, "interlocking") then - return +-- Update this signal's aspect based on the set route +-- +function signal.update_route_aspect(tcbs, skip_dst_notify) + if tcbs.signal then + if not tcbs.route_aspect and signal.get_signal_cap_level(tcbs.signal) == 2 then + return + -- Special behavior for pure-distant signals assigned to TCBs: retain their last assigned main signal + -- and do not fall back to halt. This mirrors real-life, where the distant signal goes back to + -- expect halt only when the main signal falls into halt + end + local asp = tcbs.route_aspect or "_halt" + local rem = tcbs.route_remote + signal.set_aspect(tcbs.signal, asp, rem, skip_dst_notify) end - -- IP assignment - local signalpos = players_assign_ip[pname] - if signalpos then - if vector.distance(pos, signalpos)<=50 then - local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) - if node_ok and #conns == 2 then - - local yaw = player:get_look_horizontal() - local plconnid = advtrains.yawToClosestConn(yaw, conns) - - -- add assignment if not already present. - local pts = advtrains.roundfloorpts(pos) - if not advtrains.interlocking.db.get_ip_signal_asp(pts, plconnid) then - advtrains.interlocking.db.set_ip_signal(pts, plconnid, signalpos) - ipmarker(pos, plconnid) - minetest.chat_send_player(pname, "Configuring Signal: Successfully set influence point") - else - minetest.chat_send_player(pname, "Configuring Signal: Influence point of another signal is already present!") +end + +-- Returns how capable the signal is with regards to aspect setting +-- 0: not a signal at all +-- 1: signal has get_aspect_info() but the aspect is not variable (e.g. a sign) +-- 2: signal has apply_aspect() and main aspects but has "pure_distant" flag set (cannot be start/endpoint of a route, special behavior that its route aspect is not cleared on train pass) +-- 3: signal has main signal role but can only ever display a halt aspect, such as a bumper (can be endpoint, but not startpoint, of a route) +-- 4: Full capabilities, signal has main aspects and can be used as main/shunt signal (can be start/endpoint of a route) +function signal.get_signal_cap_level(pos) + local node = advtrains.ndb.get_node_or_nil(pos) + local ndef = node and minetest.registered_nodes[node.name] + local ndefat = ndef and ndef.advtrains + if ndefat and ndefat.get_aspect_info then + if ndefat.apply_aspect and ndefat.main_aspects then + if not ndefat.pure_distant then + -- if the table contains anything, 4, otherwise 3 + for _,_ in pairs(ndefat.main_aspects) do + return 4 end - else - minetest.chat_send_player(pname, "Configuring Signal: This is not a normal two-connection rail! Aborted.") + return 3 end - else - minetest.chat_send_player(pname, "Configuring Signal: Node is too far away. Aborted.") + return 2 end - players_assign_ip[pname] = nil + return 1 end -end) - - ---== aspect selector ==-- + return 0 +end -local players_aspsel = {} +---------------- ---[[ -suppasp: "supported_aspects" table -purpose: form title string -callback: func(pname, aspect) called on form submit -isasp: aspect currently set -]] -function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_purpose, callback, isasp) - local suppasp = p_suppasp or { - main = {0, -1}, dst = {false}, shunt = false, info = {}, - } - local purpose = p_purpose or "" - - local form = "size[7,5]label[0.5,0.5;Select Signal Aspect:]" - form = form.."label[0.5,1;"..purpose.."]" - - form = form.."label[0.5,1.5;== Main Signal ==]" - local selid = 1 - local entries = {} - for idx, spv in ipairs(suppasp.main) do - local entry - if spv == 0 then - entry = "Halt" - elseif spv == -1 then - entry = "Continue at maximum speed" - elseif not spv then - entry = "Continue\\, speed limit unchanged (no info)" - else - entry = "Continue at speed of "..spv +function signal.can_dig(pos, player) + local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos) + if sigd then + -- check privileges + if not player or not minetest.check_player_privs(player:get_player_name(), "interlocking") then + if not player then -- intermediate debug to uncover hard-to-find bugz + atwarn("advtrains.interlocking.signal.can_dig(",pos,") called with player==nil!") + end + return false end - -- hack: the crappy formspec system returns the label, not the index. save the index in it. - entries[idx] = idx.."| "..entry - if isasp and spv == (isasp.main or false) then - selid = idx + -- check if route is set + local tcbs = advtrains.interlocking.db.get_tcbs(sigd) + if tcbs.routeset then + return false end end - form = form.."dropdown[0.5,2;6;main;"..table.concat(entries, ",")..";"..selid.."]" - - - form = form.."label[0.5,3;== Shunting ==]" - if suppasp.shunt == nil then - local st = 1 - if isasp and isasp.shunt then st=2 end - form = form.."dropdown[0.5,3.5;6;shunt_free;---,allowed;"..st.."]" - end - - form = form.."button_exit[0.5,4.5; 5,1;save;OK]" - - local token = advtrains.random_id() - - minetest.show_formspec(pname, "at_il_sigaspdia_"..token, form) - - minetest.after(1, function() - players_aspsel[pname] = { - suppasp = suppasp, - callback = callback, - token = token, - } - end) + return true end -local function usebool(sup, val, free) - if sup == nil then - return val==free - else - return sup +function signal.after_dig(pos, oldnode, oldmetadata, player) + -- unassign signal if necessary + local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos) + if sigd then + advtrains.interlocking.db.unassign_signal_for_tcbs(sigd) + --minetest.chat_send_player(player:get_player_name(), "Signal has been unassigned. Name and routes are kept for reuse.") + end + -- clear influence point + local ipts,iconnid = advtrains.interlocking.db.get_ip_by_signalpos(pos) + if ipts then + advtrains.interlocking.db.clear_ip_signal(ipts, iconnid) end + advtrains.interlocking.signal.unregister_aspect(pos) end --- other side of hack: extract the index -local function ddindex(val) - return tonumber(string.match(val, "^(%d+)|")) +function signal.on_rightclick(pos, node, player, itemstack, pointed_thing) + local pname = player:get_player_name() + local control = player:get_player_control() + advtrains.interlocking.show_signal_form(pos, node, pname, control.aux1) end --- TODO use non-hacky way to parse outputs - -minetest.register_on_player_receive_fields(function(player, formname, fields) - local pname = player:get_player_name() - local psl = players_aspsel[pname] - if psl then - if formname == "at_il_sigaspdia_"..psl.token then - if fields.save then - local maini = ddindex(fields.main) - if not maini then return end - local asp = { - main = psl.suppasp.main[maini], - dst = false, - shunt = usebool(psl.suppasp.shunt, fields.shunt_free, "allowed"), - info = {} - } - psl.callback(pname, asp) - end - else - players_aspsel[pname] = nil - end - end - -end) +advtrains.interlocking.signal = signal diff --git a/advtrains_interlocking/signal_aspect_ui.lua b/advtrains_interlocking/signal_aspect_ui.lua new file mode 100644 index 0000000..6ba1f7a --- /dev/null +++ b/advtrains_interlocking/signal_aspect_ui.lua @@ -0,0 +1,286 @@ +local F = advtrains.formspec + +-- Get current translator +local S = advtrains.interlocking.translate + +function advtrains.interlocking.show_signal_form(pos, node, pname, aux_key) + local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos) + if sigd and not aux_key then + advtrains.interlocking.show_signalling_form(sigd, pname) + else + if advtrains.interlocking.signal.get_signal_cap_level(pos) >= 2 then + advtrains.interlocking.show_ip_sa_form(pos, pname) + else + advtrains.interlocking.show_ip_form(pos, pname) + end + end +end + +local players_assign_ip = {} +local players_assign_distant = {} + +local function ipmarker(ipos, connid) + local node_ok, conns, rhe = advtrains.get_rail_info_at(ipos, advtrains.all_tracktypes) + if not node_ok then return end + local yaw = advtrains.dir_to_angle(conns[connid].c) + + -- using tcbmarker here + local obj = minetest.add_entity(vector.add(ipos, {x=0, y=0.2, z=0}), "advtrains_interlocking:tcbmarker") + if not obj then return end + obj:set_yaw(yaw) + obj:set_properties({ + textures = { "at_il_signal_ip.png" }, + }) +end + +function advtrains.interlocking.make_ip_formspec_component(pos, x, y, w) + advtrains.interlocking.db.check_for_duplicate_ip(pos) + local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos) + if pts then + -- display marker + local ipos = minetest.string_to_pos(pts) + ipmarker(ipos, connid) + return table.concat { + F.label(x, y, S("Influence point is set at @1.", string.format("%s/%s", pts, connid))), + F.button_exit(x, y+0.5, w/2-0.125, "ip_set", S("Modify")), + F.button_exit(x+w/2+0.125, y+0.5, w/2-0.125, "ip_clear", S("Clear")), + } + else + return table.concat { + F.label(x, y, S("Influence point is not set.")), + F.button_exit(x, y+0.5, w, "ip_set", S("Set influence point")), + } + end +end + +-- shows small formspec to set the signal influence point +-- only_notset: show only if it is not set yet (used by signal tcb assignment) +function advtrains.interlocking.show_ip_form(pos, pname, only_notset) + if not minetest.check_player_privs(pname, "interlocking") then + return + end + local ipform = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7) + local form = { + "formspec_version[4]", + "size[8,2.25]", + ipform, + } + if not only_notset or not pts then + minetest.show_formspec(pname, "at_il_ipsaform_"..minetest.pos_to_string(pos), table.concat(form)) + end +end + +-- shows larger formspec to set the signal influence point, main aspect and distant signal pos +-- only_notset: show only if it is not set yet (used by signal tcb assignment) +function advtrains.interlocking.show_ip_sa_form(pos, pname) + if not minetest.check_player_privs(pname, "interlocking") then + return + end + local ipform = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7) + local ma, rpos = advtrains.interlocking.signal.get_aspect(pos) + local form = { + "formspec_version[4]", + "size[8,4.5]", + ipform, + } + -- Create Signal aspect formspec elements + local ndef = advtrains.ndb.get_ndef(pos) + if ndef and ndef.advtrains then + form[#form+1] = F.label(0.5, 2, S("Signal Aspect:")) + -- main aspect list + if ndef.advtrains.main_aspects then + local entries = { S("<none>") } + local sel = 1 + for i, mae in ipairs(ndef.advtrains.main_aspects) do + entries[i+1] = mae.description + if ma and ma.name == mae.name then + sel = i+1 + end + end + form[#form+1] = F.dropdown(0.5, 2.5, 4, "sa_mainaspect", entries, sel, true) + end + -- distant signal assign (is shown either when main_aspect is not none, or when pure distant signal) + if rpos then + form[#form+1] = F.button_exit(0.5, 3.5, 4, "sa_undistant", S("Dst: @1", minetest.pos_to_string(rpos)) ) + elseif (ma and not ma.halt) or not ndef.advtrains.main_aspects then + form[#form+1] = F.button_exit(0.5, 3.5, 4, "sa_distant", S("<assign distant>")) + end + end + + minetest.show_formspec(pname, "at_il_ipsaform_"..minetest.pos_to_string(pos), table.concat(form)) +end + +function advtrains.interlocking.handle_ip_sa_formspec_fields(pname, pos, fields) + if not (pos and minetest.check_player_privs(pname, {train_operator=true, interlocking=true})) then + return + end + local ma, rpos = advtrains.interlocking.signal.get_aspect(pos) + -- mainaspect dropdown + if fields.sa_mainaspect then + local idx = tonumber(fields.sa_mainaspect) + local new_ma = nil + if idx > 1 then + local ndef = advtrains.ndb.get_ndef(pos) + if ndef and ndef.advtrains and ndef.advtrains.main_aspects then + new_ma = ndef.advtrains.main_aspects[idx - 1] + end + end + if new_ma then + advtrains.interlocking.signal.set_aspect(pos, new_ma.name, rpos) + else + -- reset everything + advtrains.interlocking.signal.clear_aspect(pos) + end + + end + -- buttons + if fields.ip_set then + advtrains.interlocking.init_ip_assign(pos, pname) + return + elseif fields.ip_clear then + advtrains.interlocking.db.clear_ip_by_signalpos(pos) + return + elseif fields.sa_distant then + advtrains.interlocking.init_distant_assign(pos, pname) + return + elseif fields.sa_undistant then + advtrains.interlocking.signal.set_aspect(pos, ma.name, nil) + return + end + -- show the form again unless one of the buttons was clicked + if not fields.quit then + advtrains.interlocking.show_ip_sa_form(pos, pname) + end +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + local pname = player:get_player_name() + local pts = string.match(formname, "^at_il_ipsaform_([^_]+)$") + local pos + if pts then + pos = minetest.string_to_pos(pts) + end + if pos then + advtrains.interlocking.handle_ip_sa_formspec_fields(pname, pos, fields) + end +end) + +-- inits the signal IP assignment process +function advtrains.interlocking.init_ip_assign(pos, pname) + if not minetest.check_player_privs(pname, "interlocking") then + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) + return + end + --remove old IP + --advtrains.interlocking.db.clear_ip_by_signalpos(pos) + minetest.chat_send_player(pname, S("Configuring Signal: Please look in train's driving direction and punch rail to set influence point.")) + + players_assign_ip[pname] = pos +end + +-- inits the distant signal assignment process +function advtrains.interlocking.init_distant_assign(pos, pname) + if not minetest.check_player_privs(pname, "interlocking") then + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) + return + end + minetest.chat_send_player(pname, S("Set distant signal: Punch the main signal to assign!")) + + players_assign_distant[pname] = pos +end + +-- Tries to automatically find a TCB to assign to the signal, or a main signal if this is a pure distant signal and another signal is found before the TCB +local function try_auto_assign_to_tcb(signalpos, pos, connid, pname) + local pure_distant = advtrains.interlocking.signal.get_signal_cap_level(signalpos) == 2 -- exactly 2: pure distant sig + local is_past_first = false + local ti = advtrains.get_track_iterator(pos, connid, pure_distant and 150 or 16, false) -- maximum 16 track nodes ahead + local apos, aconnid = ti:next_branch() + while apos do + -- check for presence of a tcb + local tcb = advtrains.interlocking.db.get_tcb(apos) + if tcb then + -- check on the pointing connid whether it has a signal already + if not tcb[aconnid].signal then + -- go ahead and assign + local sigd = { p=apos, s=aconnid } + advtrains.interlocking.db.assign_signal_to_tcbs(signalpos, sigd) + -- use auto-naming + advtrains.interlocking.add_autoname_to_tcbs(tcb[aconnid], pname) + minetest.chat_send_player(pname, S("Assigned signal to the TCB at @1", core.pos_to_string(apos)) ) + advtrains.interlocking.show_tcb_marker(apos) + advtrains.interlocking.show_signalling_form(sigd, pname) + end + -- in all cases return + return + elseif pure_distant and is_past_first then + -- try to find another signal's influence point here which could be the remote of a distant signal + local pts = advtrains.roundfloorpts(apos) + local mainsig = advtrains.interlocking.db.get_ip_signal(pts, aconnid) + if mainsig and advtrains.interlocking.signal.get_signal_cap_level(mainsig) >= 3 then + advtrains.interlocking.signal.set_aspect(signalpos, "_default", mainsig) + minetest.chat_send_player(pname, S("Assigned distant signal to the main signal at @1", core.pos_to_string(mainsig)) ) + return + end + end + apos, aconnid = ti:next_track() + is_past_first = true + end + -- if we end up here limit is up +end + +minetest.register_on_punchnode(function(pos, node, player, pointed_thing) + local pname = player:get_player_name() + if not minetest.check_player_privs(pname, "interlocking") then + return + end + -- IP assignment + local signalpos = players_assign_ip[pname] + if signalpos then + if vector.distance(pos, signalpos)<=50 then + local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) + if node_ok and #conns == 2 then + + local yaw = player:get_look_horizontal() + local plconnid = advtrains.yawToClosestConn(yaw, conns) + + -- add assignment if not already present. + local pts = advtrains.roundfloorpts(pos) + if not advtrains.interlocking.db.get_ip_signal_asp(pts, plconnid) then + advtrains.interlocking.db.set_ip_signal(pts, plconnid, signalpos) + ipmarker(pos, plconnid) + minetest.chat_send_player(pname, S("Configuring Signal: Successfully set influence point")) + -- Try to find a TCB ahead and auto assign this signal there + local pc = player:get_player_control() + local no_auto_assign = pc.aux1 + if not no_auto_assign and advtrains.interlocking.signal.get_signal_cap_level(signalpos) >= 2 then + try_auto_assign_to_tcb(signalpos, pos, plconnid, pname) + end + else + minetest.chat_send_player(pname, S("Configuring Signal: Influence point of another signal is already present!")) + end + else + minetest.chat_send_player(pname, S("Configuring Signal: This is not a normal two-connection rail! Aborted.")) + end + else + minetest.chat_send_player(pname, S("Configuring Signal: Node is too far away. Aborted.")) + end + players_assign_ip[pname] = nil + end + -- DST assignment + signalpos = players_assign_distant[pname] + if signalpos then + -- get current mainaspect + local ma, rpos = advtrains.interlocking.signal.get_aspect(signalpos) + -- if punched pos is valid signal then set it as the new remote, otherwise nil + local nrpos + if advtrains.interlocking.signal.get_signal_cap_level(pos) > 1 then + nrpos = pos + if not ma or ma.halt then -- make sure that dst is never set without a main aspect (esp. for pure distant signal case) + ma = "_default" + end + advtrains.interlocking.signal.set_aspect(signalpos, ma, nrpos) + end + players_assign_distant[pname] = nil + end +end) + diff --git a/advtrains_interlocking/smartroute.lua b/advtrains_interlocking/smartroute.lua new file mode 100644 index 0000000..2b9138c --- /dev/null +++ b/advtrains_interlocking/smartroute.lua @@ -0,0 +1,283 @@ +-- smartroute.lua +-- Implementation of the advtrains auto-route search + +-- Get current translator +local S = advtrains.interlocking.translate + +local atil = advtrains.interlocking +local ildb = atil.db +local sr = {} + + +-- Start the SmartRoute process. This searches for routes and tries to match them with existing routes, showing them in a form +function sr.start(pname, sigd) + -- is start signal a shunt signal? This becomes default setting for searching_shunt + local is_startsignal_shunt = false + local tcbs = ildb.get_tcbs(sigd) + if tcbs.signal then + local ndef = advtrains.ndb.get_ndef(tcbs.signal) + if ndef and ndef.advtrains then + if ndef.advtrains.route_role == "shunt" then + is_startsignal_shunt = true + end + end + end + sr.propose_next(pname, sigd, 0, is_startsignal_shunt) +end + + +local function otherside(s) + if s==1 then return 2 else return 1 end +end + +--route search implementation +-- new 2025-01-06: rely on the already present info from rscache to traverse sections +-- this allows to implement a breadth first search +-- format of foundroute: +-- { name = "the name", tcbseq = { list of sigds in sequence, not containing the start sigd }} + +local function build_route_from_foundroute(froute, name) + local route = { + name = froute.name, + use_rscache = true, + smartroute_generated = true, + } + for _, sigd in ipairs(froute.tcbseq) do + route[#route+1] = { next = sigd, locks = {} } + end + return route +end + +-- Maximum num of sections for routes to be found +local RTE_MAX_SECS = 16 + +-- scan for possible routes from the start tcb in a bread-first-search manner +-- find_more_than: search is aborted only if more than the specified number of routes are found +function sr.rescan(pname, sigd, tcbs, find_more_than, searching_shunt, pname) + local found_routes = {} + local restart_tcbs = { {sigd = sigd, tcbseq = {}, secseq = {} } } + local last_len = 0 + while true do + -- take first entry out of restart_tcbs (due to the way it is inserted the first entry will always be the one with the lowest length + local cur_restart + for idx, rst in ipairs(restart_tcbs) do + cur_restart = rst + table.remove(restart_tcbs, idx) + break + end + if not cur_restart then + -- we have no candidates left. Give up and return what we have + --atdebug("(SR) No Candidates left, end rescan") + return found_routes + end + -- check if we need to stop due to having found enough routes + local cur_len = #cur_restart.tcbseq + if cur_len > last_len then + -- one level is finished, check if enoufh routes are found + if #found_routes > find_more_than then + --atdebug("(SR) Layer finished and enough routes found, end rescan") + return found_routes + end + last_len = cur_len + end + -- our current restart point is nouw in cur_restart + local c_sigd = cur_restart.sigd + --atdebug("(SR) Search continues at",c_sigd,"seqlen",#cur_restart.tcbseq) + -- do a TS repair, this also updates the RS cache should it be out of date + local c_ts_id = ildb.check_and_repair_ts_at_pos(c_sigd.p, c_sigd.s, pname, false) + if c_ts_id then + local c_ts = ildb.get_ts(c_ts_id) + local bgn_pts = advtrains.encode_pos(c_sigd.p) + local rsout = c_ts.rs_cache[bgn_pts] + if rsout then + for _, end_sigd in ipairs(c_ts.tc_breaks) do + end_pkey = advtrains.encode_pos(end_sigd.p) + if rsout[end_pkey] then + --atdebug("(SR) Section",c_ts_id,c_ts.name,"has way",c_sigd,"->",end_sigd) + local nsigd = {p=end_sigd.p, s = end_sigd.s==1 and 2 or 1} -- invert to other side + -- record nsigd in the tcbseq + local ntcbseq = table.copy(cur_restart.tcbseq) + local nsecseq = table.copy(cur_restart.secseq) + ntcbseq[#ntcbseq+1] = nsigd + nsecseq[#nsecseq+1] = c_ts.name or c_ts_id + local shall_continue = true + -- check if that sigd is a route target + local tcbs = ildb.get_tcbs(nsigd) + if tcbs.signal then + local ndef = advtrains.ndb.get_ndef(tcbs.signal) + if ndef and ndef.advtrains then + if ndef.advtrains.route_role == "main" or ndef.advtrains.route_role == "main_distant" + or ndef.advtrains.route_role == "end" or ndef.advtrains.route_role == "shunt" then + -- signal is suitable target + local is_mainsignal = ndef.advtrains.route_role ~= "shunt" + --atdebug("(SR) Suitable end signal at",nsigd,", recording route!") + -- record the found route in the results + found_routes[#found_routes+1] = { + tcbseq = ntcbseq, + secseq = nsecseq, + shunt_route = not is_mainsignal, + name = tcbs.signal_name or atil.sigd_to_string(nsigd) + } + -- if this is a main signal and/or we are only searching shunt routes, stop the search here + if is_mainsignal or searching_shunt then + --atdebug("(SR) Not continuing this branch!") + shall_continue = false + end + end + end + end + -- unless overridden, insert the next restart point + if shall_continue then + restart_tcbs[#restart_tcbs+1] = {sigd = nsigd, tcbseq = ntcbseq, secseq = nsecseq } + end + end + end + else + --atdebug("(SR) Section",c_ts_id,c_ts.name,"found no rscache entry for start ",bgn_pts) + end + else + --atdebug("(SR) Stop at",c_sigd,"because no sec ahead") + end + end +end + +local players_smartroute_actions = {} +-- Propose to pname the smartroute actions in a form, with the current settings as passed to this function +function sr.propose_next(pname, sigd, find_more_than, searching_shunt) + local tcbs = ildb.get_tcbs(sigd) + if not tcbs or not tcbs.routes then + minetest.chat_send_player(pname, S("Smartroute: TCBS or routes don't exist here!")) + return + elseif not tcbs.ts_id then + minetest.chat_send_player(pname, S("Smartroute: No track section directly ahead!")) + return + end + -- Step 1: search for routes using the current settings + local found_routes = sr.rescan(pname, sigd, tcbs, find_more_than, searching_shunt, pname) + -- Step 2: store in actions table + players_smartroute_actions[pname] = { + sigd = sigd, + searching_shunt = searching_shunt, + found_routes = found_routes + } + -- step 3: build form + local form = "size[8,5]label[0,0;"..S("Route search: @1 found", #found_routes).."]" + local tab = {} + for idx, froute in ipairs(found_routes) do + local secfl = table.copy(froute.secseq) + table.remove(secfl, 1) -- remove first and last, because it will always be the same + secfl[#secfl]=nil + local viatext = "" + if next(secfl) then + froute.via = table.concat(secfl, ", ") + viatext = " (via "..froute.via..")" + end + tab[idx] = minetest.formspec_escape(froute.name..viatext) + end + form=form.."textlist[0.5,1;7,3;rtelist;"..table.concat(tab, ",").."]" + form=form.."button[0.5,4;2,1;continue;"..S("Search further").."]" + form=form.."button[2.5,4;2,1;apply;"..S("Apply").."]" + + minetest.show_formspec(pname, "at_il_smartroute_propose", form) +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + local pname = player:get_player_name() + if not minetest.check_player_privs(pname, "interlocking") then + return + end + if formname ~= "at_il_smartroute_propose" then + return + end + -- retrieve from the storage the current search result + local srtab = players_smartroute_actions[pname] + if not srtab then + return + end + local sigd = srtab.sigd + local found_routes = srtab.found_routes + + if fields.continue then + -- search on, but find at least one route more + sr.propose_next(pname, sigd, #found_routes, srtab.searching_shunt) + return + end + + if fields.apply then + -- user is happy with the found routes. Proceed to save them in the signal + local tcbs = ildb.get_tcbs(sigd) + if not tcbs then return end + -- remove routes for endpoints for which routes already exist + local ex_endpts = {} -- key = sigd_to_string + for rtid, route in ipairs(tcbs.routes) do + local valid = advtrains.interlocking.check_route_valid(route, sigd) + local endpoint = route[#route].next -- 'next' field of the last route segment (the segment with index==len) + if valid and endpoint then + local endstr = advtrains.interlocking.sigd_to_string(endpoint) + --atdebug("(Smartroute) Find existing endpoint:",route.name,"ends at",endstr) + ex_endpts[endstr] = route.name + else + --atdebug("(Smartroute) Find existing endpoint:",route.name," not considered, endpoint",endpoint,"valid",valid) + end + end + local new_frte = {} + local endOnce = {} + local endTwice = {} + for _,froute in ipairs(found_routes) do + local endpoint = froute.tcbseq[#froute.tcbseq] + local endstr = advtrains.interlocking.sigd_to_string(endpoint) + if not ex_endpts[endstr] then + new_frte[#new_frte+1] = froute + -- record duplicate targets in froute + if endOnce[froute.name] then + endTwice[froute.name] = true + else + endOnce[froute.name] = true + end + else + --atdebug("(Smartroute) Throwing away",froute.name,"because endpoint",endstr,"already reached by route",ex_endpts[endstr]) + end + end + + -- All remaining routes will be applied to the signal + local sel_rte = #tcbs.routes+1 + for idx, froute in ipairs(new_frte) do + if endTwice[froute.name] then + -- append via text to deduplicate name + froute.name = froute.name .. " (via "..(froute.via or "direct")..")" + end + tcbs.routes[#tcbs.routes+1] = build_route_from_foundroute(froute) + end + -- if only one route present and it is newly created (there was no route before, thus sel_rte==1), make default + if sel_rte == 1 and #tcbs.routes == 1 then + local route1 = tcbs.routes[1] + route1.ars = {default=true} + -- if that only route furthermore is a suitable block signal route (1 section with no locks), set it into block signal mode + if #route1 == 1 then + local ts = tcbs.ts_id and advtrains.interlocking.db.get_ts(tcbs.ts_id) + if ts and #ts.tc_breaks == 2 then + -- check for presence of any locks + local epos1 = advtrains.encode_pos(ts.tc_breaks[1].p) + local epos2 = advtrains.encode_pos(ts.tc_breaks[2].p) + local haslocks = + (route1[1].locks and next(route1[1].locks)) -- the route itself has no locks + or (ts.fixed_locks and next(ts.fixed_locks)) -- the section has no fixedlocks + or (ts.rs_cache and ts.rs_cache[epos1] and ts.rs_cache[epos1][epos2] and next(ts.rs_cache[epos1][epos2])) -- the section has no locks in rscache + if not haslocks then + -- yeah, blocksignal! + route1.default_autoworking = true + end + end + end + end + --atdebug("Smartroute done!") + advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte) + players_smartroute_actions[pname] = nil + end + if fields.quit then + players_smartroute_actions[pname] = nil + end +end) + + +advtrains.interlocking.smartroute = sr diff --git a/advtrains_interlocking/spec/ars_spec.lua b/advtrains_interlocking/spec/ars_spec.lua new file mode 100644 index 0000000..085dbcb --- /dev/null +++ b/advtrains_interlocking/spec/ars_spec.lua @@ -0,0 +1,67 @@ +-- test the serialization function + + +package.path = "../?.lua;" .. package.path + + + + +_G.advtrains = {} +_G.advtrains.interlocking = {} + +require("ars") + +local arstb = {{ ln="Foo"}, {c="Bar"}, {n=true, rc="Boo"}} +local arsdef = {{ ln="Foo"}, {c="Bar"}, {rc="Boo"}, default=true} +local arstr = [[LN Foo +#Bar +!RC Boo]] +local defstr = [[* +LN Foo +#Bar +RC Boo]] +il = _G.advtrains.interlocking + +describe("ars_to_text", function () + it("read table", function () + assert.equals(il.ars_to_text(arstb),arstr) + end) + it("reads back and forth", function () + assert.equals(il.ars_to_text(il.text_to_ars(arstr)),arstr) + end) + it("handles default routes properly", function () + assert.equals(il.ars_to_text(arsdef),defstr) + end) +end) + +describe("text_to_ars", function () + it("writes table", function() + assert.same(il.text_to_ars(arstr),arstb) + end) + it("handles default routes properly", function () + assert.same(il.text_to_ars(defstr),arsdef) + end) +end) + +train1 = {} +train2 = {} +train3 = {} +train1.line = "Foo" +train1.routingcode = "Boo" +train2.line= "Bar" +train2.routingcode = "NotBoo NotBoo" +train3.routingcode = "Foo Boo Moo Zoo" + +describe("check_rule_match", function () + it("matches rules correctly", function() + assert.equals(il.ars_check_rule_match(arstb,train1),1) + assert.equals(il.ars_check_rule_match(arsdef,train2),nil) + end) + it("matches negative rules", function() + assert.equals(il.ars_check_rule_match(arstb,train2),3) + assert.equals(il.ars_check_rule_match(arstb,train3),nil) + end) + it("matches RC in a list correctly", function() + assert.equals(il.ars_check_rule_match(arsdef,train3),3) + end) +end) diff --git a/advtrains_interlocking/spec/basic_signalling_spec.lua b/advtrains_interlocking/spec/basic_signalling_spec.lua new file mode 100644 index 0000000..a4e1e3a --- /dev/null +++ b/advtrains_interlocking/spec/basic_signalling_spec.lua @@ -0,0 +1,106 @@ +--[[ +This file tests a large part of the signaling system, as a lot of tests for the +signaling system tend to overlap for various parts of the system. +]] + +require("mineunit") +mineunit("core") + +_G.advtrains = { + interlocking = { + aspect = fixture("../../aspect"), + }, + ndb = { + get_node = minetest.get_node, + swap_node = minetest.swap_node, + } +} + +fixture("advtrains_helpers") +fixture("../../database") +sourcefile("distant") +sourcefile("signal_api") +sourcefile("signal_aspect_accessors") +fixture("../../demosignals") + +minetest.register_node("advtrains_interlocking:signal_sign", { + advtrains = { + get_aspcet = function() return {main = 19} end + } +}) + +local D = advtrains.distant +local I = advtrains.interlocking +local A = I.aspect + +local stub_aspect_t1 = { + free = {main = -1}, + slow = {main = 6}, + danger = {main = 0, shunt = false}, +} +for k, v in pairs(stub_aspect_t1) do + stub_aspect_t1[k] = A(v) +end +local stub_pos_t1 = {} +for i = 1, 4 do + stub_pos_t1[i] = {x = 1, y = 0, z = i} +end + +world.layout { + {stub_pos_t1[1], "advtrains_interlocking:ds_danger"}, + {stub_pos_t1[2], "advtrains_interlocking:ds_slow"}, + {stub_pos_t1[3], "advtrains_interlocking:ds_free"}, + {stub_pos_t1[4], "advtrains_interlocking:signal_sign"}, +} + +describe("API for supposed signal aspects", function() + it("should load and save data properly", function() + local tbl = {_foo = {}} + I.load_supposed_aspects(tbl) + assert.same(tbl, I.save_supposed_aspects()) + end) + it("should set and get signals properly", function () + local pos = stub_pos_t1[2] + local asp = stub_aspect_t1.slow + local newasp = A{ main = math.random(1,5) } + assert.equal(asp, I.signal_get_aspect(pos)) + I.signal_set_aspect(pos, newasp) + assert.equal(newasp, I.signal_get_aspect(pos)) + assert.equal(asp, I.signal_get_real_aspect(pos)) + I.signal_set_aspect(pos, asp) + end) +end) + +describe("Distant signaling", function() + it("should assign distant signals and set the distant aspect correspondingly", function() + for i = 1, 2 do + D.assign(stub_pos_t1[i], stub_pos_t1[i+1]) + end + assert.equal(stub_aspect_t1.danger, I.signal_get_aspect(stub_pos_t1[1])) + assert.equal(A{main = 6, dst = 0}, I.signal_get_aspect(stub_pos_t1[2])) + assert.equal(A{main = -1, dst = 6}, I.signal_get_aspect(stub_pos_t1[3])) + end) + it("should report assignments properly", function() + assert.same({stub_pos_t1[1], "manual"}, {D.get_main(stub_pos_t1[2])}) + assert.same({[advtrains.encode_pos(stub_pos_t1[3])] = "manual"}, D.get_dst(stub_pos_t1[2])) + end) + it("should update distant aspects automatically", function() + I.signal_set_aspect(stub_pos_t1[2], {main = 2, dst = -1}) + assert.equal(A{main = 2, dst = 0}, I.signal_get_aspect(stub_pos_t1[2])) + assert.equal(A{main = -1, dst = 2}, I.signal_get_aspect(stub_pos_t1[3])) + end) + it("should unassign signals when one is removed", function() + world.set_node(stub_pos_t1[2], "air") + assert.same({}, D.get_dst(stub_pos_t1[1])) + assert.same({}, {D.get_main(stub_pos_t1[3])}) + assert.same(stub_aspect_t1.free, I.signal_get_aspect(stub_pos_t1[3])) + end) + it("should reject signal signs", function() + D.assign(stub_pos_t1[1], stub_pos_t1[4]) + assert.same({}, D.get_dst(stub_pos_t1[1])) + assert.same({}, {D.get_main(stub_pos_t1[4])}) + D.assign(stub_pos_t1[4], stub_pos_t1[1]) + assert.same({}, D.get_dst(stub_pos_t1[4])) + assert.same({}, {D.get_main(stub_pos_t1[1])}) + end) +end) diff --git a/advtrains_interlocking/spec/fixtures/advtrains_helpers.lua b/advtrains_interlocking/spec/fixtures/advtrains_helpers.lua new file mode 120000 index 0000000..9b0ab67 --- /dev/null +++ b/advtrains_interlocking/spec/fixtures/advtrains_helpers.lua @@ -0,0 +1 @@ +../../../advtrains/helpers.lua
\ No newline at end of file diff --git a/advtrains_interlocking/spec/mineunit.conf b/advtrains_interlocking/spec/mineunit.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/advtrains_interlocking/spec/mineunit.conf diff --git a/advtrains_interlocking/spec/signal_group_spec.lua b/advtrains_interlocking/spec/signal_group_spec.lua new file mode 100644 index 0000000..bc9d007 --- /dev/null +++ b/advtrains_interlocking/spec/signal_group_spec.lua @@ -0,0 +1,95 @@ +require "mineunit" +mineunit("core") + +_G.advtrains = { + interlocking = { + aspect = sourcefile("aspect"), + }, + ndb = { + get_node = minetest.get_node, + swap_node = minetest.swap_node, + } +} + +fixture("advtrains_helpers") +sourcefile("database") +sourcefile("signal_api") +sourcefile("distant") +sourcefile("signal_aspect_accessors") + +local A = advtrains.interlocking.aspect +local D = advtrains.distant +local I = advtrains.interlocking +local N = advtrains.ndb + +local groupdef = { + name = "foo", + aspects = { + proceed = {main = -1}, + caution = {}, + danger = {main = 0}, + "proceed", + {"caution"}, + "danger", + }, +} + +for k, v in pairs(groupdef.aspects) do + minetest.register_node("advtrains_interlocking:" .. k, { + advtrains = { + supported_aspects = { + group = "foo", + }, + get_aspect = function() return A{group = "foo", name = k} end, + set_aspect = function(pos, _, name) + N.swap_node(pos, {name = "advtrains_interlocking:" .. name}) + end, + } + }) +end + +local origin = vector.new(0, 0, 0) +local dstpos = vector.new(0, 0, 1) + +world.layout { + {origin, "advtrains_interlocking:danger"}, + {dstpos, "advtrains_interlocking:proceed"}, +} + +describe("signal group registration", function() + it("should work", function() + A.register_group(groupdef) + assert(A.get_group_definition("foo")) + end) + it("should only be allowed once for the same group", function() + assert.has.errors(function() A.register_group(type2def) end) + end) + it("should handle nonexistant groups", function() + assert.is_nil(A.get_group_definition("something_else")) + end) + it("should reject invalid definitions", function() + assert.has.errors(function() A.register_group({}) end) + assert.has.errors(function() A.register_group({name="",label={}}) end) + assert.has.errors(function() A.register_group({name="",aspects={}}) end) + end) +end) + +describe("signal aspect", function() + it("should handle empty fields properly", function() + assert.equal(A{main = 0}, A{group="foo", name="danger"}:to_group()) + end) + it("should be converted properly", function() + assert.equal(A{main = 0}, A{group="foo", name="danger"}) + assert.equal(A{}, A{group="foo", name="caution"}) + assert.equal(A{main = -1}, A{group="foo", name="proceed"}) + end) +end) + +describe("signals in groups", function() + it("should support distant signaling", function() + assert.equal("caution", A():adjust_distant(A{group="foo",name="danger"}).name) + assert.equal("proceed", A():adjust_distant(A{group="foo",name="caution"}).name) + assert.equal("proceed", A():adjust_distant(A{group="foo",name="proceed"}).name) + assert.equal("danger", A{group="foo",name="danger"}:adjust_distant{}.name) + end) +end) diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua index 34fbf7f..0111f5e 100755 --- a/advtrains_interlocking/tcb_ts_ui.lua +++ b/advtrains_interlocking/tcb_ts_ui.lua @@ -1,9 +1,15 @@ -- Track Circuit Breaks and Track Sections - Player interaction +-- Get current translator +local S = advtrains.interlocking.translate + local players_assign_tcb = {} local players_assign_signal = {} +local players_assign_xlink = {} local players_link_ts = {} +local players_assign_fixedlocks = {} +local atil = advtrains.interlocking local ildb = advtrains.interlocking.db local ilrs = advtrains.interlocking.route @@ -14,6 +20,7 @@ local lntrans = { "A", "B" } local function sigd_to_string(sigd) return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s] end +advtrains.interlocking.sigd_to_string = sigd_to_string minetest.register_node("advtrains_interlocking:tcb_node", { drawtype = "mesh", @@ -26,7 +33,7 @@ minetest.register_node("advtrains_interlocking:tcb_node", { }, mesh = "at_il_tcb_node.obj", tiles = {"at_il_tcb_node.png"}, - description="Track Circuit Break", + description=S("Track Circuit Break"), sunlight_propagates=true, groups = { cracky=3, @@ -36,12 +43,12 @@ minetest.register_node("advtrains_interlocking:tcb_node", { }, after_place_node = function(pos, node, player) local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Unconfigured Track Circuit Break, right-click to assign.") + meta:set_string("infotext", S("Unconfigured Track Circuit Break, right-click to assign.")) end, on_rightclick = function(pos, node, player) local pname = player:get_player_name() if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end @@ -53,11 +60,11 @@ minetest.register_node("advtrains_interlocking:tcb_node", { if tcb then advtrains.interlocking.show_tcb_form(tcbpos, pname) else - minetest.chat_send_player(pname, "This TCB has been removed. Please dig marker.") + minetest.chat_send_player(pname, S("This TCB has been removed. Please dig marker.")) end else --unconfigured - minetest.chat_send_player(pname, "Configuring TCB: Please punch the rail you want to assign this TCB to.") + minetest.chat_send_player(pname, S("Configuring TCB: Please punch the rail you want to assign this TCB to.")) players_assign_tcb[pname] = pos end @@ -81,19 +88,15 @@ minetest.register_node("advtrains_interlocking:tcb_node", { local tcbpts = meta:get_string("tcb_pos") if tcbpts ~= "" then if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end local tcbpos = minetest.string_to_pos(tcbpts) local tcb = ildb.get_tcb(tcbpos) if not tcb then return true end for connid=1,2 do - if tcb[connid].ts_id or tcb[connid].signal then - minetest.chat_send_player(pname, "Can't remove TCB: Both sides must have no track section and no signal assigned!") - return false - end - if not ildb.may_modify_tcbs(tcb[connid]) then - minetest.chat_send_player(pname, "Can't remove TCB: Side "..connid.." forbids modification (shouldn't happen).") + if tcb[connid].signal then + minetest.chat_send_player(pname, S("Can't remove TCB: Both sides must have no signal assigned!")) return false end end @@ -102,18 +105,11 @@ minetest.register_node("advtrains_interlocking:tcb_node", { end, after_dig_node = function(pos, oldnode, oldmetadata, player) if not oldmetadata or not oldmetadata.fields then return end + local pname = player:get_player_name() local tcbpts = oldmetadata.fields.tcb_pos if tcbpts and tcbpts ~= "" then local tcbpos = minetest.string_to_pos(tcbpts) - local success = ildb.remove_tcb(tcbpos) - if success and player then - minetest.chat_send_player(player:get_player_name(), "TCB has been removed.") - else - minetest.chat_send_player(player:get_player_name(), "Failed to remove TCB!") - minetest.set_node(pos, oldnode) - local meta = minetest.get_meta(pos) - meta:set_string("tcb_pos", minetest.pos_to_string(tcbpos)) - end + ildb.remove_tcb_at(tcbpos, pname) end end, }) @@ -165,26 +161,25 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing) local tcbnpos = players_assign_tcb[pname] if tcbnpos then if vector.distance(pos, tcbnpos)<=20 then - local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) + local node_ok, conns, rhe = advtrains.get_rail_info_at(pos) if node_ok and #conns == 2 then - local ok = ildb.create_tcb(pos) - - if not ok then - minetest.chat_send_player(pname, "Configuring TCB: TCB already exists at this position! It has now been re-assigned.") + -- if there is already a tcb here, reassign it + if ildb.get_tcb(pos) then + minetest.chat_send_player(pname, S("Configuring TCB: Already existed at this position, it is now linked to this TCB marker")) + else + ildb.create_tcb_at(pos, pname) end - - ildb.sync_tcb_neighbors(pos, 1) - ildb.sync_tcb_neighbors(pos, 2) - + local meta = minetest.get_meta(tcbnpos) meta:set_string("tcb_pos", minetest.pos_to_string(pos)) - meta:set_string("infotext", "TCB assigned to "..minetest.pos_to_string(pos)) - minetest.chat_send_player(pname, "Configuring TCB: Successfully configured TCB") + meta:set_string("infotext", S("TCB assigned to @1", minetest.pos_to_string(pos))) + minetest.chat_send_player(pname, S("Configuring TCB: Successfully configured TCB")) + advtrains.interlocking.show_tcb_marker(pos) else - minetest.chat_send_player(pname, "Configuring TCB: This is not a normal two-connection rail! Aborted.") + minetest.chat_send_player(pname, S("Configuring TCB: This is not a normal two-connection rail! Aborted.")) end else - minetest.chat_send_player(pname, "Configuring TCB: Node is too far away. Aborted.") + minetest.chat_send_player(pname, S("Configuring TCB: Node is too far away. Aborted.")) end players_assign_tcb[pname] = nil end @@ -196,65 +191,225 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing) local is_signal = minetest.get_item_group(node.name, "advtrains_signal") >= 2 if is_signal then local ndef = minetest.registered_nodes[node.name] - if ndef and ndef.advtrains and ndef.advtrains.set_aspect then + if ndef and ndef.advtrains and ndef.advtrains.apply_aspect then local tcbs = ildb.get_tcbs(sigd) if tcbs then - tcbs.signal = pos - if not tcbs.signal_name then - tcbs.signal_name = "Signal at "..minetest.pos_to_string(sigd.p) - end - if not tcbs.routes then - tcbs.routes = {} - end - ildb.set_sigd_for_signal(pos, sigd) - minetest.chat_send_player(pname, "Configuring TCB: Successfully assigned signal.") + ildb.assign_signal_to_tcbs(pos, sigd) + -- use auto-naming + advtrains.interlocking.add_autoname_to_tcbs(tcbs, pname) + minetest.chat_send_player(pname, S("Configuring TCB: Successfully assigned signal.")) advtrains.interlocking.show_ip_form(pos, pname, true) else - minetest.chat_send_player(pname, "Configuring TCB: Internal error, TCBS doesn't exist. Aborted.") + minetest.chat_send_player(pname, S("Configuring TCB: Internal error, TCBS doesn't exist. Aborted.")) end else - minetest.chat_send_player(pname, "Configuring TCB: Cannot use static signals for routesetting. Aborted.") + minetest.chat_send_player(pname, S("Configuring TCB: Cannot use static signals for routesetting. Aborted.")) end else - minetest.chat_send_player(pname, "Configuring TCB: Not a compatible signal. Aborted.") + minetest.chat_send_player(pname, S("Configuring TCB: Not a compatible signal. Aborted.")) end else - minetest.chat_send_player(pname, "Configuring TCB: Node is too far away. Aborted.") + minetest.chat_send_player(pname, S("Configuring TCB: Node is too far away. Aborted.")) end players_assign_signal[pname] = nil end + + -- FixedLocks assignment + local ts_id = players_assign_fixedlocks[pname] + if ts_id then + if advtrains.is_passive(pos) then + local pts = advtrains.encode_pos(pos) + local state = advtrains.getstate(pos) + local ts = ildb.get_ts(ts_id) + if ts and ts.fixed_locks then + minetest.chat_send_player(pname, S("@1 locks in state @2", minetest.pos_to_string(pos), state)) + ts.fixed_locks[pts] = state + else + minetest.chat_send_player(pname, S("Error: TS modified, abort!")) + players_assign_fixedlocks[pname] = nil + end + else + minetest.chat_send_player(pname, S("Setting fixed locks finished!")) + players_assign_fixedlocks[pname] = nil + ildb.update_rs_cache(ts_id) + advtrains.interlocking.show_ts_form(ts_id, pname) + end + end end) +-- "Self-contained TCB" +-- 2024-11-25: Buffers should become their own TCB (and signal) automatically to permit setting routes to them +-- These are support functions for this kind of node. + +-- Create an after_place_node callback for a self-contained TCB node. The parameters control additional behavior: +-- fail_silently_on_noprivs: (boolean) Does not give an error in case the placer does not have the interlocking privilege +-- auto_create_self_signal: (boolean) Automatically assign this same node as signal to the A side of the newly-created TCB +-- (this is useful for buffers as they serve both as TCB and as an always-halt signal) +function advtrains.interlocking.self_tcb_make_after_place_callback(fail_silently_on_noprivs, auto_create_self_signal) + return function(pos, player, itemstack, pointed_thing) + local pname = player:get_player_name() + if not minetest.check_player_privs(pname, "interlocking") then + if not fail_silently_on_noprivs then + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) + end + return + end + if ildb.get_tcb(pos) then + minetest.chat_send_player(pname, S("TCB already existed at this position, now linked to this node")) + else + ildb.create_tcb_at(pos, pname) + end + if auto_create_self_signal then + local sigd = { p = pos, s = 1 } + local tcbs = ildb.get_tcbs(sigd) + -- make sure signal doesn't already exist + if tcbs.signal then + minetest.chat_send_player(pname, S("Signal on B side already assigned!")) + return + end + ildb.assign_signal_to_tcbs(pos, sigd) + -- assign influence point to itself + ildb.set_ip_signal(advtrains.roundfloorpts(pos), 1, pos) + -- use auto-naming + advtrains.interlocking.add_autoname_to_tcbs(tcbs, pname) + end + end +end + +-- Create an can_dig callback for a self-contained TCB node. The parameters control additional behavior: +-- is_signal: (boolean) Whether this node is also a signal (in addition to being a TCB), e.g. when auto_create_self_signal was set. +-- Causes also the signal API's can_dig to be called +function advtrains.interlocking.self_tcb_make_can_dig_callback(is_signal) + return function(pos, player) + local pname = player and player:get_player_name() or "" + -- need to duplicate logic of the regular "can_dig_or_modify_track()" function in core/tracks.lua + if advtrains.get_train_at_pos(pos) then + minetest.chat_send_player(pname, S("Can't remove track, a train is here!")) + return false + end + -- end of standard checks + local tcb = ildb.get_tcb(pos) + if not tcb then + -- digging always allowed because the TCB hasn't been created (unless signal callback interjects) + if is_signal then + return advtrains.interlocking.signal.can_dig(pos, player) + else + return true + end + end + -- TCB exists + if not minetest.check_player_privs(pname, "interlocking") then + return false + end + -- fine to remove (unless signal callback interjects) + if is_signal then + return advtrains.interlocking.signal.can_dig(pos, player) + else + return true + end + end +end + +-- Create an after_dig_node callback for a self-contained TCB node. The parameters control additional behavior: +-- is_signal: (boolean) Whether this node is also a signal (in addition to being a TCB), e.g. when auto_create_self_signal was set. +-- Causes also the signal API's after_dig_node to be called +function advtrains.interlocking.self_tcb_make_after_dig_callback(is_signal) + return function(pos, oldnode, oldmetadata, player) + local pname = player:get_player_name() + if is_signal then + -- "dig" the signal first + advtrains.interlocking.signal.after_dig(pos, oldnode, oldmetadata, player) + end + if ildb.get_tcb(pos) then + -- remove the TCB + ildb.remove_tcb_at(pos, pname, true) + end + end +end + +-- Create an on_rightclick callback for a self-contained TCB node. The rightclick callback tries to repeat the TCB assignment +-- if necessary and otherwise shows the TCB formspec. The parameters control additional behavior: +-- fail_silently_on_noprivs: (boolean) Does not give an error in case the placer does not have the interlocking privilege +-- auto_create_self_signal: (boolean) Automatically assign this same node as signal to the B side of the +-- newly-created TCB if that has not already happened during place. +-- Otherwise, opens the signal dialog instead of the TCB dialog on rightclick +function advtrains.interlocking.self_tcb_make_on_rightclick_callback(fail_silently_on_noprivs, auto_create_self_signal) + return function(pos, node, player, itemstack, pointed_thing) + local pname = player:get_player_name() + if not minetest.check_player_privs(pname, "interlocking") then + if not fail_silently_on_noprivs then + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) + end + return + end + if ildb.get_tcb(pos) then + -- TCB already here. go on + else + -- otherwise create tcb + ildb.create_tcb_at(pos, pname) + end + if auto_create_self_signal then + local sigd = { p = pos, s = 1 } + local tcbs = ildb.get_tcbs(sigd) + -- make sure signal doesn't already exist + if not tcbs.signal then + -- go ahead and assign signal + ildb.assign_signal_to_tcbs(pos, sigd) + -- assign influence point to itself + ildb.set_ip_signal(advtrains.roundfloorpts(pos), 1, pos) + -- use auto-naming + advtrains.interlocking.add_autoname_to_tcbs(tcbs, pname) + end + -- in any case open the signalling form nouw + local control = player:get_player_control() + advtrains.interlocking.show_signal_form(pos, node, pname, control.aux1) + return + else + -- not an autosignal. Then show the TCB form + advtrains.interlocking.show_tcb_form(pos, pname) + return + end + end +end + -- TCB Form -local function mktcbformspec(tcbs, btnpref, offset, pname) +local function mktcbformspec(pos, side, tcbs, offset, pname) local form = "" + local btnpref = side==1 and "A" or "B" local ts + -- ensure that mapping and xlink are up to date + ildb.tcbs_ensure_ts_ref_exists({p=pos, s=side, tcbs=tcbs}) + ildb.validate_tcb_xlink({p=pos, s=side, tcbs=tcbs}) + -- Note: repair operations may have been triggered by this if tcbs.ts_id then ts = ildb.get_ts(tcbs.ts_id) end if ts then - form = form.."label[0.5,"..offset..";Side "..btnpref..": "..minetest.formspec_escape(ts.name).."]" - form = form.."button[0.5,"..(offset+0.5)..";5,1;"..btnpref.."_gotots;Show track section]" - if ildb.may_modify_tcbs(tcbs) then - -- Note: the security check to prohibit those actions is located in database.lua in the corresponding functions. - form = form.."button[0.5,"..(offset+1.5)..";2.5,1;"..btnpref.."_update;Update near TCBs]" - form = form.."button[3 ,"..(offset+1.5)..";2.5,1;"..btnpref.."_remove;Remove from section]" - end + form = form.."label[0.5,"..offset..";"..S("Side @1", btnpref)..": "..minetest.formspec_escape(ts.name or tcbs.ts_id).."]" + form = form.."button[0.5,"..(offset+0.5)..";5,1;"..btnpref.."_gotots;"..S("Show track section").."]" else tcbs.ts_id = nil - form = form.."label[0.5,"..offset..";Side "..btnpref..": ".."End of interlocking]" - form = form.."button[0.5,"..(offset+0.5)..";5,1;"..btnpref.."_makeil;Create Interlocked Track Section]" - --if tcbs.section_free then - --form = form.."button[0.5,"..(offset+1.5)..";5,1;"..btnpref.."_setlocked;Section is free]" - --else - --form = form.."button[0.5,"..(offset+1.5)..";5,1;"..btnpref.."_setfree;Section is blocked]" - --end + form = form.."label[0.5,"..offset..";Side "..btnpref..": "..S("End of interlocking").."]" + form = form.."button[0.5,"..(offset+0.5)..";5,1;"..btnpref.."_makeil;"..S("Create Interlocked Track Section").."]" + end + -- xlink + if tcbs.xlink then + form = form.."label[0.5,"..(offset+1.5)..";"..S("Link: @1", ildb.sigd_to_string(tcbs.xlink)).."]" + form = form.."button[4.5,"..(offset+1.5)..";1,1;"..btnpref.."_xlinkdel;X]" + else + if players_assign_xlink[pname] then + form = form.."button[0.5,"..(offset+1.5)..";4,1;"..btnpref.."_xlinklink;"..S("Link @1", ildb.sigd_to_string(players_assign_xlink[pname])).."]" + form = form.."button[4.5,"..(offset+1.5)..";1,1;"..btnpref.."_xlinkabrt;X]" + else + form = form.."label[0.5,"..(offset+1.5)..";"..S("No Link").."]" + form = form.."button[4.5,"..(offset+1.5)..";1,1;"..btnpref.."_xlinkadd;+]" + end end if tcbs.signal then - form = form.."button[0.5,"..(offset+2.5)..";5,1;"..btnpref.."_sigdia;Signalling]" + form = form.."button[0.5,"..(offset+2.5)..";5,1;"..btnpref.."_sigdia;"..S("Signalling").."]" else - form = form.."button[0.5,"..(offset+2.5)..";5,1;"..btnpref.."_asnsig;Assign a signal]" + form = form.."button[0.5,"..(offset+2.5)..";5,1;"..btnpref.."_asnsig;"..S("Assign a signal").."]" end return form end @@ -262,15 +417,15 @@ end function advtrains.interlocking.show_tcb_form(pos, pname) if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end local tcb = ildb.get_tcb(pos) if not tcb then return end - local form = "size[6,9] label[0.5,0.5;Track Circuit Break Configuration]" - form = form .. mktcbformspec(tcb[1], "A", 1, pname) - form = form .. mktcbformspec(tcb[2], "B", 5, pname) + local form = "size[6,9] label[0.5,0.5;"..S("Track Circuit Break Configuration").."]" + form = form .. mktcbformspec(pos, 1, tcb[1], 1, pname) + form = form .. mktcbformspec(pos, 2, tcb[2], 5, pname) minetest.show_formspec(pname, "at_il_tcbconfig_"..minetest.pos_to_string(pos), form) advtrains.interlocking.show_tcb_marker(pos) @@ -297,13 +452,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local tcb = ildb.get_tcb(pos) if not tcb then return end local f_gotots = {fields.A_gotots, fields.B_gotots} - local f_update = {fields.A_update, fields.B_update} - local f_remove = {fields.A_remove, fields.B_remove} local f_makeil = {fields.A_makeil, fields.B_makeil} - local f_setlocked = {fields.A_setlocked, fields.B_setlocked} - local f_setfree = {fields.A_setfree, fields.B_setfree} local f_asnsig = {fields.A_asnsig, fields.B_asnsig} local f_sigdia = {fields.A_sigdia, fields.B_sigdia} + local f_xlinkadd = {fields.A_xlinkadd, fields.B_xlinkadd} + local f_xlinkdel = {fields.A_xlinkdel, fields.B_xlinkdel} + local f_xlinklink = {fields.A_xlinklink, fields.B_xlinklink} + local f_xlinkabrt = {fields.A_xlinkabrt, fields.B_xlinkabrt} for connid=1,2 do local tcbs = tcb[connid] @@ -312,32 +467,37 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) advtrains.interlocking.show_ts_form(tcbs.ts_id, pname) return end - if f_update[connid] then - ildb.sync_tcb_neighbors(pos, connid) - end - if f_remove[connid] then - ildb.remove_from_interlocking({p=pos, s=connid}) - end else if f_makeil[connid] then - -- try sinc_tcb_neighbors first - ildb.sync_tcb_neighbors(pos, connid) - -- if that didn't work, create new section if not tcbs.ts_id then - ildb.create_ts({p=pos, s=connid}) - ildb.sync_tcb_neighbors(pos, connid) + ildb.create_ts_from_tcbs({p=pos, s=connid}) end end - -- non-interlocked - if f_setfree[connid] then - tcbs.section_free = true + end + if tcbs.xlink then + if f_xlinkdel[connid] then + ildb.remove_tcb_xlink({p=pos, s=connid}) end - if f_setlocked[connid] then - tcbs.section_free = nil + else + local osigd = players_assign_xlink[pname] + if osigd then + if f_xlinklink[connid] then + ildb.add_tcb_xlink({p=pos, s=connid}, osigd) + players_assign_xlink[pname] = nil + elseif f_xlinkabrt[connid] then + players_assign_xlink[pname] = nil + end + else + if f_xlinkadd[connid] then + players_assign_xlink[pname] = {p=pos, s=connid} + minetest.chat_send_player(pname, S("TCB Link: Select linked TCB now!")) + minetest.close_formspec(pname, formname) + return -- to not reopen form + end end end if f_asnsig[connid] and not tcbs.signal then - minetest.chat_send_player(pname, "Configuring TCB: Please punch the signal to assign.") + minetest.chat_send_player(pname, S("Configuring TCB: Please punch the signal to assign.")) players_assign_signal[pname] = {p=pos, s=connid} minetest.close_formspec(pname, formname) return @@ -357,20 +517,17 @@ end) -- TS Formspec --- textlist selection temporary storage -local ts_pselidx = {} - -function advtrains.interlocking.show_ts_form(ts_id, pname, sel_tcb) +function advtrains.interlocking.show_ts_form(ts_id, pname) if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end local ts = ildb.get_ts(ts_id) if not ts_id then return end - local form = "size[10,10]label[0.5,0.5;Track Section Detail - "..ts_id.."]" - form = form.."field[0.8,2;5.2,1;name;Section name;"..minetest.formspec_escape(ts.name).."]" - form = form.."button[5.5,1.7;1,1;setname;Set]" + local form = "size[10.5,10]label[0.5,0.5;"..S("Track Section Detail - @1", ts_id).."]" + form = form.."field[0.8,2;5.2,1;name;"..S("Section name")..";"..minetest.formspec_escape(ts.name or "").."]" + form = form.."button[5.5,1.7;1,1;setname;"..S("Set").."]" local hint local strtab = {} @@ -379,58 +536,51 @@ function advtrains.interlocking.show_ts_form(ts_id, pname, sel_tcb) advtrains.interlocking.show_tcb_marker(sigd.p) end - form = form.."textlist[0.5,3;5,3;tcblist;"..table.concat(strtab, ",").."]" + form = form.."label[0.5,2.5;"..S("Boundary TCBs:").."]" + form = form.."textlist[0.5,3;4,3;tcblist;"..table.concat(strtab, ",").."]" + + -- additional route locks (e.g. for level crossings) + + strtab = {} + if ts.fixed_locks then + for pts, state in pairs(ts.fixed_locks) do + strtab[#strtab+1] = minetest.formspec_escape( + minetest.pos_to_string(advtrains.decode_pos(pts)).." = "..state) + end + end + form = form.."label[5.5,2.5;"..S("Fixed route locks (e.g. level crossings):").."]" + form = form.."textlist[5.5,3;4,3;fixedlocks;"..table.concat(strtab, ",").."]" if ildb.may_modify_ts(ts) then + form = form.."button[5.5,6;2,1;flk_add;"..S("Add locks").."]" + form = form.."button[7.5,6;2,1;flk_clear;"..S("Clear locks").."]" - if players_link_ts[pname] then - local other_id = players_link_ts[pname] - local other_ts = ildb.get_ts(other_id) - if other_ts then - if ildb.may_modify_ts(other_ts) then - form = form.."button[5.5,3;3.5,1;mklink;Join with "..minetest.formspec_escape(other_ts.name).."]" - form = form.."button[9 ,3;0.5,1;cancellink;X]" - end - end - else - form = form.."button[5.5,3;4,1;link;Join into other section]" - hint = 1 - end - form = form.."button[5.5,4;4,1;dissolve;Dissolve Section]" - form = form.."tooltip[dissolve;This will remove the track section and set all its end points to End Of Interlocking]" - if sel_tcb then - form = form.."button[5.5,5;4,1;del_tcb;Unlink selected TCB]" - hint = 2 - end + form = form.."button[5.5,8;4,1;remove;"..S("Remove Section").."]" + form = form.."tooltip[remove;"..S("This will remove the track section and set all its end points to End Of Interlocking").."]" else hint=3 end if ts.route then - form = form.."label[0.5,6.1;Route is set: "..ts.route.rsn.."]" + form = form.."label[0.5,6.1;"..S("Route is set: ")..ts.route.rsn.."]" elseif ts.route_post then - form = form.."label[0.5,6.1;Section holds "..#(ts.route_post.lcks or {}).." route locks.]" + form = form.."label[0.5,6.1;"..S("Section holds @1 route locks.", #(ts.route_post.lcks or {})).."]" end -- occupying trains if ts.trains and #ts.trains>0 then - form = form.."label[0.5,7.1;Trains on this section:]" + form = form.."label[0.5,7.1;"..S("Trains on this section:").."]" form = form.."textlist[0.5,7.7;3,2;trnlist;"..table.concat(ts.trains, ",").."]" else - form = form.."label[0.5,7.1;No trains on this section.]" + form = form.."label[0.5,7.1;"..S("No trains on this section.").."]" end - form = form.."button[5.5,7;4,1;reset;Reset section state]" - - if hint == 1 then - form = form.."label[0.5,0.75;Use the 'Join' button to designate rail crosses and link not listed far-away TCBs]" - elseif hint == 2 then - form = form.."label[0.5,0.75;Unlinking a TCB will set it to non-interlocked mode.]" - elseif hint == 3 then - form = form.."label[0.5,0.75;You cannot modify track sections when a route is set or a train is on the section.]" + form = form.."button[5.5,7;4,1;reset;"..S("Reset section state").."]" + + if hint == 3 then + form = form.."label[0.5,0.75;"..S("You cannot modify track sections when a route is set or a train is on the section.").."]" --form = form.."label[0.5,1;Trying to unlink a TCB directly connected to this track will not work.]" end - ts_pselidx[pname]=sel_tcb minetest.show_formspec(pname, "at_il_tsconfig_"..ts_id, form) end @@ -442,45 +592,15 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) return end -- independent of the formspec, clear this whenever some formspec event happens - local tpsi = ts_pselidx[pname] - ts_pselidx[pname] = nil local ts_id = string.match(formname, "^at_il_tsconfig_(.+)$") if ts_id and not fields.quit then local ts = ildb.get_ts(ts_id) if not ts then return end - local sel_tcb - if fields.tcblist then - local tev = minetest.explode_textlist_event(fields.tcblist) - sel_tcb = tev.index - ts_pselidx[pname] = sel_tcb - elseif tpsi then - sel_tcb = tpsi - end - if ildb.may_modify_ts(ts) then - if players_link_ts[pname] then - if fields.cancellink then - players_link_ts[pname] = nil - elseif fields.mklink then - ildb.link_track_sections(players_link_ts[pname], ts_id) - players_link_ts[pname] = nil - end - end - - if fields.del_tcb and sel_tcb and sel_tcb > 0 and sel_tcb <= #ts.tc_breaks then - if not ildb.remove_from_interlocking(ts.tc_breaks[sel_tcb]) then - minetest.chat_send_player(pname, "Please unassign signal first!") - end - sel_tcb = nil - end - - if fields.link then - players_link_ts[pname] = ts_id - end - if fields.dissolve then - ildb.dissolve_ts(ts_id) + if fields.remove then + ildb.remove_ts(ts_id) minetest.close_formspec(pname, formname) return end @@ -489,17 +609,29 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.setname then ts.name = fields.name if ts.name == "" then - ts.name = "Section "..ts_id + ts.name = nil end end + if fields.flk_add then + if not ts.fixed_locks then + ts.fixed_locks = {} + end + players_assign_fixedlocks[pname] = ts_id + minetest.chat_send_player(pname, S("Punch components to add fixed locks. (punch anything else = end)")) + minetest.close_formspec(pname, formname) + return + elseif fields.flk_clear then + ts.fixed_locks = nil + end + if fields.reset then -- User requested resetting the section -- Show him what this means... - local form = "size[7,5]label[0.5,0.5;Reset track section]" - form = form.."label[0.5,1;This will clear the list of trains\nand the routesetting status of this section.\nAre you sure?]" - form = form.."button_exit[0.5,2.5; 5,1;reset;Yes]" - form = form.."button_exit[0.5,3.5; 5,1;cancel;Cancel]" + local form = "size[7,5]label[0.5,0.5;"..S("Reset track section").."]" + form = form.."label[0.5,1;"..S("This will clear the list of trains\nand the routesetting status of this section.\nAre you sure?").."]" + form = form.."button_exit[0.5,2.5; 5,1;reset;"..S("Yes").."]" + form = form.."button_exit[0.5,3.5; 5,1;cancel;"..S("Cancel").."]" minetest.show_formspec(pname, "at_il_tsreset_"..ts_id, form) return end @@ -520,9 +652,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) ts.route = nil for _, sigd in ipairs(ts.tc_breaks) do local tcbs = ildb.get_tcbs(sigd) - advtrains.interlocking.update_signal_aspect(tcbs) + advtrains.interlocking.signal.update_route_aspect(tcbs) end - minetest.chat_send_player(pname, "Reset track section "..ts_id.."!") + minetest.chat_send_player(pname, S("Reset track section @1!", ts_id)) end end) @@ -550,6 +682,13 @@ minetest.register_entity("advtrains_interlocking:tcbmarker", { static_save = false, }) +function advtrains.interlocking.remove_tcb_marker_pts(pts) + if markerent[pts] then + markerent[pts]:remove() + markerent[pts] = nil + end +end + function advtrains.interlocking.show_tcb_marker(pos) --atdebug("showing tcb marker",pos) local tcb = ildb.get_tcb(pos) @@ -566,16 +705,14 @@ function advtrains.interlocking.show_tcb_marker(pos) ts = ildb.get_ts(tcbs.ts_id) end if ts then - itex[connid] = ts.name + itex[connid] = ts.name or tcbs.ts_id or "???" else itex[connid] = "--EOI--" end end local pts = advtrains.roundfloorpts(pos) - if markerent[pts] then - markerent[pts]:remove() - end + advtrains.interlocking.remove_tcb_marker_pts(pts) local obj = minetest.add_entity(pos, "advtrains_interlocking:tcbmarker") if not obj then return end @@ -589,6 +726,92 @@ function advtrains.interlocking.show_tcb_marker(pos) markerent[pts] = obj end +function advtrains.interlocking.remove_tcb_marker(pos) + local pts = advtrains.roundfloorpts(pos) + if markerent[pts] then + markerent[pts]:remove() + end + markerent[pts] = nil +end + +local ts_showparticles_callback = function(pos, connid, bconnid) + minetest.add_particle({ + pos = pos, + velocity = {x=0, y=0, z=0}, + acceleration = {x=0, y=0, z=0}, + expirationtime = 10, + size = 7, + vertical = true, + texture = "at_il_ts_highlight_particle.png", + glow = 6, + }) +end + +-- Spawns particles to highlight the clicked track section +-- TODO: Adapt behavior to not dumb-walk anymore +function advtrains.interlocking.highlight_track_section(pos) + local all_tcbs = ildb.get_all_tcbs_adjacent(pos, nil, ts_showparticles_callback) + for _,sigd in ipairs(all_tcbs) do + advtrains.interlocking.show_tcb_marker(sigd.p) + end +end + +-- checks that the given route is still valid (i.e. all its TCBs, sections and locks exist) +-- returns true (ok) or false, reason (on issue) +function advtrains.interlocking.check_route_valid(route, sigd) + -- this code is partially copy-pasted from routesetting.lua + -- we start at the tc designated by signal + local c_sigd = sigd + local i = 1 + local c_tcbs, c_ts_id, c_ts, c_rseg + while c_sigd and i<=#route do + c_tcbs = ildb.get_tcbs(c_sigd) + if not c_tcbs then + return false, S("TCB at @1 is missing", sigd_to_string(c_sigd)) + end + c_ts_id = c_tcbs.ts_id + if not c_ts_id then + return false, S("Track section after @1 missing", sigd_to_string(c_sigd)) + end + c_ts = ildb.get_ts(c_ts_id) + + c_rseg = route[i] + + if c_rseg.locks then + for pts, state in pairs(c_rseg.locks) do + local pos = advtrains.decode_pos(pts) + if not advtrains.is_passive(pos) then + return false, S("Turnout/component missing at @1", minetest.pos_to_string(pos)) + end + end + end + -- sanity check, is section at next the same as the current? + local nvar = c_rseg.next + if nvar then + local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1}) + if not re_tcbs then + return false, S("TCB at @1 is missing", minetest.pos_to_string(nvar.p)) + elseif not re_tcbs.ts_id then + return false, S("TCB at @1 is not assigned to previous track section", minetest.pos_to_string(nvar.p)) + elseif re_tcbs.ts_id~=c_ts_id then + return false, S("TCB at @1 has different section than previous TCB", minetest.pos_to_string(nvar.p)) + end + end + -- advance + c_sigd = nvar + i = i + 1 + end + -- check end TCB + if not c_sigd then + return false, S("Final TCBS unset (legacy-style buffer route)") + end + c_tcbs = ildb.get_tcbs(c_sigd) + if not c_tcbs then + return false, S("TCB at @1 is missing", sigd_to_string(c_sigd)) + end + return true, nil, c_sigd +end + -- Signalling formspec - set routes a.s.o -- textlist selection temporary storage @@ -598,90 +821,137 @@ local p_open_sig_form = {} function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, called_from_form_update) if not minetest.check_player_privs(pname, "train_operator") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end local hasprivs = minetest.check_player_privs(pname, "interlocking") local tcbs = ildb.get_tcbs(sigd) if not tcbs.signal then return end - if not tcbs.signal_name then tcbs.signal_name = "Signal at "..minetest.pos_to_string(sigd.p) end if not tcbs.routes then tcbs.routes = {} end - local form = "size[7,10]label[0.5,0.5;Signal at "..minetest.pos_to_string(sigd.p).."]" - form = form.."field[0.8,1.5;5.2,1;name;Signal name;"..minetest.formspec_escape(tcbs.signal_name).."]" - form = form.."button[5.5,1.2;1,1;setname;Set]" + local form = "size[7,10.25]label[0.5,0.5;"..S("Signal at @1", minetest.pos_to_string(sigd.p)).."]" + form = form.."field[0.8,1.5;5.2,1;name;"..S("Signal name")..";"..minetest.formspec_escape(tcbs.signal_name or "").."]" + form = form.."button[5.5,1.2;1,1;setname;"..S("Set").."]" if tcbs.routeset then - local rte = tcbs.routes[tcbs.routeset] - if not rte then - atwarn("Unknown route set from signal!") - tcbs.routeset = nil - return + if type(tcbs.routeset)=="table" then + local rtenames = {} + for midx,rteid in ipairs(tcbs.routeset) do + local rte = tcbs.routes[rteid] + if not rte then + atwarn("Unknown route set from signal!") + tcbs.routeset = nil + return + end + rtenames[midx] = rte.name + end + form = form.."label[0.5,2.5;"..S("Multiple routes are requested (first available is set):").."]" + form = form.."label[0.5,3.0;"..minetest.formspec_escape(table.concat(rtenames,", ")).."]" + else + local rte = tcbs.routes[tcbs.routeset] + if not rte then + atwarn("Unknown route set from signal!") + tcbs.routeset = nil + return + end + form = form.."label[0.5,2.5;"..S("A route is requested from this signal:").."]" + form = form.."label[0.5,3.0;"..minetest.formspec_escape(rte.name).."]" end - form = form.."label[0.5,2.5;A route is requested from this signal:]" - form = form.."label[0.5,3.0;"..minetest.formspec_escape(rte.name).."]" if tcbs.route_committed then - form = form.."label[0.5,3.5;Route has been set.]" + form = form.."label[0.5,3.5;"..S("Route has been set.").."]" else - form = form.."label[0.5,3.5;Waiting for route to be set...]" + form = form.."label[0.5,3.5;"..S("Waiting for route to be set...").."]" if tcbs.route_rsn then form = form.."label[0.5,4;"..minetest.formspec_escape(tcbs.route_rsn).."]" end end if not tcbs.route_auto then - form = form.."button[0.5,7; 5,1;auto;Enable Automatic Working]" + form = form.."button[0.5,7; 5,1;auto;"..S("Enable Automatic Working").."]" else - form = form.."label[0.5,7 ;Automatic Working is active.]" - form = form.."label[0.5,7.3;Route is re-set when a train passed.]" - form = form.."button[0.5,7.7; 5,1;noauto;Disable Automatic Working]" + form = form.."label[0.5,7 ;"..S("Automatic Working is active.").."]" + form = form.."label[0.5,7.3;"..S("Route is re-set when a train passed.").."]" + form = form.."button[0.5,7.7; 5,1;noauto;"..S("Disable Automatic Working").."]" end - form = form.."button[0.5,6; 5,1;cancelroute;Cancel Route]" + form = form.."button[0.5,6; 5,1;cancelroute;"..S("Cancel Route").."]" else if not tcbs.route_origin then - local strtab = {} - for idx, route in ipairs(tcbs.routes) do - local clr = "" - if route.ars then - clr = "#FF5555" - if route.ars.default then - clr = "#55FF55" + if #tcbs.routes > 0 then + -- at least one route is defined, show normal dialog + local strtab = {} + for idx, route in ipairs(tcbs.routes) do + local rname = route.name + local valid = atil.check_route_valid(route, sigd) + local clr = "" + if not valid then + clr = "#FF5555" + rname = rname..S(" (invalid)") + elseif route.ars then + clr = "#FFFF55" + if route.ars.default then + clr = "#55FF55" + end + end + strtab[#strtab+1] = clr .. minetest.formspec_escape(rname) + end + form = form.."label[0.5,2.5;"..S("Routes:").."]" + form = form.."textlist[0.5,3;5,3;rtelist;"..table.concat(strtab, ",") + if sel_rte then + form = form .. ";" .. sel_rte .."]" + form = form.."button[0.5,6; 5,1;setroute;"..S("Set Route").."]" + form = form.."button[0.5,7;2,1;dsproute;"..S("Show").."]" + if hasprivs then + form = form.."button[5.5,3.3;1,0.3;setarsdefault;D]tooltip[setarsdefault;"..S("Set ARS default route").."]" + form = form.."button[3.5,7;2,1;editroute;"..S("Edit").."]" + if sel_rte > 1 then + form = form .. "button[5.5,4;1,0.3;moveup;↑]" + end + if sel_rte < #strtab then + form = form .. "button[5.5,4.7;1,0.3;movedown;↓]" + end + form = form.."button[5.5,5.4;1,0.3;delroute;X]tooltip[delroute;"..S("Delete this route").."]" + end + else + form = form .. "]" + if tcbs.ars_disabled then + form = form.."label[0.5,6 ;"..S("NOTE: ARS is disabled.").."]" + form = form.."label[0.5,6.5;"..S("Routes are not automatically set.").."]" end end - strtab[#strtab+1] = clr .. minetest.formspec_escape(route.name) - end - form = form.."label[0.5,2.5;Routes:]" - form = form.."textlist[0.5,3;5,3;rtelist;"..table.concat(strtab, ",").."]" - if sel_rte then - form = form.."button[0.5,6; 5,1;setroute;Set Route]" - form = form.."button[0.5,7;2,1;dsproute;Show]" if hasprivs then - form = form.."button[3.5,7;2,1;editroute;Edit]" + form = form.."button[0.5,8;2.5,1;smartroute;"..S("Smart Route").."]" + form = form.."button[ 3,8;2.5,1;newroute;"..S("New (Manual)").."]" + form = form..string.format("checkbox[0.5,8.75;ars;"..S("Automatic routesetting")..";%s]", not tcbs.ars_disabled) + form = form..string.format("checkbox[0.5,9.25;dstarstrig;"..S("Distant signal triggers ARS")..";%s]", not tcbs.no_dst_ars_trig) end else - if tcbs.ars_disabled then - form = form.."label[0.5,6 ;NOTE: ARS is disabled.]" - form = form.."label[0.5,6.5;Routes are not automatically set.]" + -- no route is active, and no route is so far defined + if not tcbs.signal then atwarn("signalling form missing signal?!", pos) return end -- safeguard, nothing else in this function checks tcbs.signal + local caps = advtrains.interlocking.signal.get_signal_cap_level(tcbs.signal) + if caps >= 4 then + -- offer user the "block signal mode" + form = form.."label[0.5,2.5;"..S("No routes are yet defined.").."]" + if hasprivs then + form = form.."button[0.5,4;2.5,1;smartroute;"..S("Smart Route").."]" + form = form.."button[ 3,4;2.5,1;newroute;"..S("New (Manual)").."]" + end + elseif caps >= 3 then + -- it's a buffer! + form = form.."label[0.5,2.5;"..S("This is an always-halt signal (e.g. a buffer)\nNo routes can be set from here.").."]" + else + -- signal caps say it cannot be route start/end + form = form.."label[0.5,2.5;"..S("This is a pure distant signal\nNo route is currently set through.").."]" end end - if hasprivs then - form = form.."button[0.5,8;2.5,1;newroute;New Route]" - form = form.."button[ 3,8;2.5,1;unassign;Unassign Signal]" - form = form.."button[ 3,9;2.5,1;influp;Influence Point]" - end - if tcbs.ars_disabled then - form = form.."button[0.5,9;2.5,1;arsenable;Enable ARS]" - else - form = form.."button[0.5,9;2.5,1;arsdisable;Disable ARS]" - end + elseif sigd_equal(tcbs.route_origin, sigd) then -- something has gone wrong: tcbs.routeset should have been set... - form = form.."label[0.5,2.5;Inconsistent state: route_origin is same TCBS but no route set. Try again.]" + form = form.."label[0.5,2.5;".."Inconsistent state: route_origin is same TCBS but no route set. Try again.".."]" ilrs.cancel_route_from(sigd) else - form = form.."label[0.5,2.5;Route is set over this signal by:\n"..sigd_to_string(tcbs.route_origin).."]" - form = form.."label[0.5,4;Wait for this route to be cancelled in order to do anything here.]" + form = form.."label[0.5,2.5;"..S("Route is set over this signal by:").."\n"..sigd_to_string(tcbs.route_origin).."]" + form = form.."label[0.5,4;"..S("Wait for this route to be cancelled in order to do anything here.").."]" end end sig_pselidx[pname] = sel_rte @@ -691,14 +961,14 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle -- always a good idea to update the signal aspect if not called_from_form_update then -- FIX prevent a callback loop - advtrains.interlocking.update_signal_aspect(tcbs) + advtrains.interlocking.signal.update_route_aspect(tcbs) end end function advtrains.interlocking.update_player_forms(sigd) for pname, tsigd in pairs(p_open_sig_form) do if advtrains.interlocking.sigd_equal(sigd, tsigd) then - advtrains.interlocking.show_signalling_form(sigd, pname, nil) + advtrains.interlocking.show_signalling_form(sigd, pname, nil, true) end end end @@ -711,10 +981,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end local hasprivs = minetest.check_player_privs(pname, "interlocking") - -- independent of the formspec, clear this whenever some formspec event happens local tpsi = sig_pselidx[pname] - sig_pselidx[pname] = nil - p_open_sig_form[pname] = nil local pts, connids = string.match(formname, "^at_il_signalling_([^_]+)_(%d)$") local pos, connid @@ -723,25 +990,37 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) connid = tonumber(connids) if not connid or connid<1 or connid>2 then return end end - if pos and connid and not fields.quit then + if pos and connid then local sigd = {p=pos, s=connid} local tcbs = ildb.get_tcbs(sigd) if not tcbs then return end - + + if fields.quit then + sig_pselidx[pname] = nil + p_open_sig_form[pname] = nil + -- form quit: disable temporary ARS ignore + tcbs.ars_ignore_next = nil + return + end + local sel_rte if fields.rtelist then local tev = minetest.explode_textlist_event(fields.rtelist) - sel_rte = tev.index + if tev.type ~= "INV" then + sel_rte = tev.index + end elseif tpsi then sel_rte = tpsi end if fields.setname and fields.name and hasprivs then - tcbs.signal_name = fields.name + if fields.name == "" then + tcbs.signal_name = nil -- do not save a signal name if it isnt used (equivalent to track sections) + else + tcbs.signal_name = fields.name + end end if tcbs.routeset and fields.cancelroute then - if tcbs.routes[tcbs.routeset] and tcbs.routes[tcbs.routeset].ars then - tcbs.ars_disabled = true - end + tcbs.ars_ignore_next = true -- if route committed, cancel route ts info ilrs.update_route(sigd, tcbs, nil, true) end @@ -749,6 +1028,14 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.newroute and hasprivs then advtrains.interlocking.init_route_prog(pname, sigd) minetest.close_formspec(pname, formname) + tcbs.ars_ignore_next = nil + p_open_sig_form[pname] = nil -- form is closed/left, do not reopen + return + end + if fields.smartroute and hasprivs then + advtrains.interlocking.smartroute.start(pname, sigd) + tcbs.ars_ignore_next = nil + p_open_sig_form[pname] = nil -- form is closed/left, do not reopen return end if sel_rte and tcbs.routes[sel_rte] then @@ -762,39 +1049,46 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end if fields.editroute and hasprivs then advtrains.interlocking.show_route_edit_form(pname, sigd, sel_rte) - --local rte = tcbs.routes[sel_rte] - --minetest.show_formspec(pname, formname.."_renroute_"..sel_rte, "field[name;Enter new route name;"..rte.name.."]") + p_open_sig_form[pname] = nil -- form is closed/left, do not reopen return end + if fields.setarsdefault and hasprivs then + for rid, route in ipairs(tcbs.routes) do + local isdefault = rid == sel_rte + if route.ars then + if route.ars.default and isdefault then + -- D button pressed but route was already default - remove ars default field! + route.ars.default = nil + elseif isdefault then + route.ars.default = true + else + route.ars.default = nil + end + -- if the table is nouw empty delete it + if not next(route.ars) then + route.ars = nil + end + elseif isdefault then + route.ars = {default = true} + end + end + end + if fields.delroute and hasprivs then + if tcbs.routes[sel_rte] and tcbs.routes[sel_rte].ars then + minetest.chat_send_player(pname, S("Cannot delete route which has ARS rules, please review and then delete through edit dialog!")) + else + table.remove(tcbs.routes,sel_rte) + end + end end end - if fields.unassign and hasprivs then - -- unassigning the signal from the tcbs - -- only when no route is set. - -- Routes and name remain saved, in case the player wants to reassign a new signal - if not tcbs.routeset then - local signal_pos = tcbs.signal - ildb.set_sigd_for_signal(signal_pos, nil) - tcbs.signal = nil - tcbs.aspect = nil - minetest.close_formspec(pname, formname) - minetest.chat_send_player(pname, "Signal has been unassigned. Name and routes are kept for reuse.") - return - else - minetest.chat_send_player(pname, "Please cancel route first!") - end - end - if fields.influp and hasprivs then - advtrains.interlocking.show_ip_form(tcbs.signal, pname) - return + if fields.ars then + tcbs.ars_disabled = not minetest.is_yes(fields.ars) end - if tcbs.ars_disabled and fields.arsenable then - tcbs.ars_disabled = nil - end - if not tcbs.ars_disabled and fields.arsdisable then - tcbs.ars_disabled = true + if fields.dstarstrig then + tcbs.no_dst_ars_trig = not minetest.is_yes(fields.dstarstrig) end if fields.auto then @@ -803,28 +1097,22 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.noauto then tcbs.route_auto = false end + + if sel_rte and tcbs.routes[sel_rte]and not tcbs.routeset then + if fields.moveup then + if tcbs.routes[sel_rte - 1] then + tcbs.routes[sel_rte - 1], tcbs.routes[sel_rte] = tcbs.routes[sel_rte], tcbs.routes[sel_rte - 1] + sel_rte = sel_rte - 1 + end + elseif fields.movedown then + if tcbs.routes[sel_rte + 1] then + tcbs.routes[sel_rte + 1], tcbs.routes[sel_rte] = tcbs.routes[sel_rte], tcbs.routes[sel_rte + 1] + sel_rte = sel_rte + 1 + end + end + end advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, true) return end - - - if not hasprivs then return end - -- rename route - local rind, rte_id - pts, connids, rind = string.match(formname, "^at_il_signalling_([^_]+)_(%d)_renroute_(%d+)$") - if pts then - pos = minetest.string_to_pos(pts) - connid = tonumber(connids) - rte_id = tonumber(rind) - if not connid or connid<1 or connid>2 then return end - end - if pos and connid and rind and fields.name then - local sigd = {p=pos, s=connid} - local tcbs = ildb.get_tcbs(sigd) - if tcbs.routes[rte_id] then - tcbs.routes[rte_id].name = fields.name - advtrains.interlocking.show_signalling_form(sigd, pname) - end - end end) diff --git a/advtrains_interlocking/textures/at_il_ts_highlight_particle.png b/advtrains_interlocking/textures/at_il_ts_highlight_particle.png Binary files differnew file mode 100644 index 0000000..4ba3622 --- /dev/null +++ b/advtrains_interlocking/textures/at_il_ts_highlight_particle.png diff --git a/advtrains_interlocking/tool.lua b/advtrains_interlocking/tool.lua index 5d38b3a..d7a42b4 100644 --- a/advtrains_interlocking/tool.lua +++ b/advtrains_interlocking/tool.lua @@ -1,46 +1,109 @@ -- tool.lua -- Interlocking tool +-- Get current translator +local S = advtrains.interlocking.translate + local ilrs = advtrains.interlocking.route +local function node_right_click(pos, pname, player) + if advtrains.is_passive(pos) then + local form = "size[7,5]label[0.5,0.5;"..S("Route lock inspector").."]" + local pts = advtrains.encode_pos(pos) + + local rtl = ilrs.has_route_lock(pts) + + if rtl then + form = form.."label[0.5,1;"..S("Route locks currently put:").."\n"..rtl.."]" + form = form.."button_exit[0.5,3.5; 5,1;clear;"..S("Clear").."]" + else + form = form.."label[0.5,1;"..S("No route locks set").."]" + form = form.."button_exit[0.5,3.5; 5,1;emplace;"..S("Emplace manual lock").."]" + end + + minetest.show_formspec(pname, "at_il_rtool_"..pts, form) + return + end + + -- If not a turnout, check the track section and show a form + local node_ok, conns, rail_y=advtrains.get_rail_info_at(pos) + if not node_ok then + minetest.chat_send_player(pname, S("Node is not a track!")) + return + end + if advtrains.interlocking.db.get_tcb(pos) then + advtrains.interlocking.show_tcb_form(pos, pname) + return + end + + local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos, nil, pname) + if ts_id then + advtrains.interlocking.show_ts_form(ts_id, pname) + else + minetest.chat_send_player(pname, S("No track section at this location!")) + end +end + +local function node_left_click(pos, pname, player) + local node_ok, conns, rail_y=advtrains.get_rail_info_at(pos) + if not node_ok then + minetest.chat_send_player(pname, S("Node is not a track!")) + return + end + + if advtrains.interlocking.db.get_tcb(pos) then + advtrains.interlocking.show_tcb_marker(pos) + return + end + + -- create track section if aux1 button down + local pc = player:get_player_control() + local force_create = pc.aux1 + + local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos, nil, pname, force_create) + if ts_id then + advtrains.interlocking.db.update_rs_cache(ts_id) + advtrains.interlocking.highlight_track_section(pos) + else + minetest.chat_send_player(pname, S("No track section at this location!")) + end +end + + minetest.register_craftitem("advtrains_interlocking:tool",{ - description = "Interlocking tool\nright-click turnouts to inspect route locks", + description = S("Interlocking tool\nPunch: Highlight track section\nPlace: check route locks/show track section info"), groups = {cracky=1}, -- key=name, value=rating; rating=1..3. inventory_image = "at_il_tool.png", wield_image = "at_il_tool.png", stack_max = 1, - on_place = function(itemstack, placer, pointed_thing) - local pname = placer:get_player_name() + on_place = function(itemstack, player, pointed_thing) + local pname = player:get_player_name() if not pname then return end if not minetest.check_player_privs(pname, {interlocking=true}) then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) return end if pointed_thing.type=="node" then local pos=pointed_thing.under - if advtrains.is_passive(pos) then - local form = "size[7,5]label[0.5,0.5;Route lock inspector]" - local pts = minetest.pos_to_string(pos) - - local rtl = ilrs.has_route_lock(pts) - - if rtl then - form = form.."label[0.5,1;Route locks currently put:\n"..rtl.."]" - form = form.."button_exit[0.5,3.5; 5,1;clear;Clear]" - else - form = form.."label[0.5,1;No route locks set]" - form = form.."button_exit[0.5,3.5; 5,1;emplace;Emplace manual lock]" - end - - minetest.show_formspec(pname, "at_il_rtool_"..pts, form) - else - minetest.chat_send_player(pname, "Cannot use this here.") - return - end + node_right_click(pos, pname, player) end end, + on_use = function(itemstack, player, pointed_thing) + local pname = player:get_player_name() + if not pname then + return + end + if not minetest.check_player_privs(pname, {interlocking=true}) then + minetest.chat_send_player(pname, S("Insufficient privileges to use this!")) + return + end + if pointed_thing.type=="node" then + local pos=pointed_thing.under + node_left_click(pos, pname, player) + end + end }) minetest.register_on_player_receive_fields(function(player, formname, fields) @@ -51,7 +114,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local pos local pts = string.match(formname, "^at_il_rtool_(.+)$") if pts then - pos = minetest.string_to_pos(pts) + pos = advtrains.decode_pos(pts) end if pos then if advtrains.is_passive(pos) then @@ -64,3 +127,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end end end) + +minetest.register_craft({ + output = "advtrains_interlocking:tool", + type = "shapeless", + recipe = {"dye:green","advtrains:trackworker", "advtrains_interlocking:tcb_node"} +}) diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua index 757f36a..dab9cae 100644 --- a/advtrains_interlocking/train_sections.lua +++ b/advtrains_interlocking/train_sections.lua @@ -40,83 +40,99 @@ local function itkexist(tbl, ikey, com) return false end -local function itremove(tbl, com) +local function itremove(tbl, com, once) local i=1 while i <= #tbl do if tbl[i] == com then table.remove(tbl, i) + if once then return end else i = i + 1 end end end -local function itkremove(tbl, ikey, com) +local function itkremove(tbl, ikey, com, once) local i=1 while i <= #tbl do if tbl[i][ikey] == com then table.remove(tbl, i) + if once then return end else i = i + 1 end end end -local function setsection(tid, train, ts_id, ts, sigd) +local function setsection(tid, train, ts_id, ts, sigd, only_if_not_exist) -- train if not train.il_sections then train.il_sections = {} end - if not itkexist(train.il_sections, "ts_id", ts_id) then + if only_if_not_exist then + -- called for the back connid on enter, only to ensure that section is blocked if train was so far not registered + if not itkexist(train.il_sections, "ts_id", ts_id) then + table.insert(train.il_sections, {ts_id = ts_id, origin = sigd}) + end + else + -- insert always, this leads to duplicate entries if the train enters the same section a second time table.insert(train.il_sections, {ts_id = ts_id, origin = sigd}) end -- ts if not ts.trains then ts.trains = {} end - if not itexist(ts.trains, tid) then + if only_if_not_exist then + -- called for the back connid on enter, only to ensure that section is blocked if train was so far not registered + if not itexist(ts.trains, tid) then + table.insert(ts.trains, tid) + end + else table.insert(ts.trains, tid) end -- routes - local tcbs = advtrains.interlocking.db.get_tcbs(sigd) + local tcbs + if sigd then + tcbs = advtrains.interlocking.db.get_tcbs(sigd) + end -- route setting - clear route state if ts.route then --atdebug(tid,"enters",ts_id,"examining Routestate",ts.route) - if not sigd_equal(ts.route.entry, sigd) then + if sigd and not sigd_equal(ts.route.entry, sigd) then -- Train entered not from the route. Locate origin and cancel route! atwarn("Train",tid,"hit route",ts.route.rsn,"!") advtrains.interlocking.route.cancel_route_from(ts.route.origin) atwarn("Route was cancelled.") else - -- train entered route regularily. Reset route and signal - tcbs.route_committed = nil - tcbs.route_comitted = nil -- TODO compatibility cleanup - tcbs.aspect = nil - tcbs.route_origin = nil - advtrains.interlocking.update_signal_aspect(tcbs) - if tcbs.signal and sigd_equal(ts.route.entry, ts.route.origin) then - if tcbs.route_auto and tcbs.routeset then - --atdebug("Resetting route (",ts.route.origin,")") - advtrains.interlocking.route.update_route(ts.route.origin, tcbs) - else - tcbs.routeset = nil - end - end + -- train entered route regularily. end ts.route = nil end - if tcbs.signal then + if tcbs and tcbs.signal then + -- Reset route and signal + -- Note that the hit-route case is already handled by cancel_route_from + -- this code only handles signal at entering tcb and also triggers for non-route ts + tcbs.route_committed = nil + tcbs.route_aspect = nil + tcbs.route_remote = nil + tcbs.route_origin = nil + tcbs.route_rsn = nil + if not tcbs.route_auto then + tcbs.routeset = nil + end + advtrains.interlocking.signal.update_route_aspect(tcbs) advtrains.interlocking.route.update_route(sigd, tcbs) end end -local function freesection(tid, train, ts_id, ts) +local function freesection(tid, train, ts_id, ts, clear_all) -- train if not train.il_sections then train.il_sections = {} end - itkremove(train.il_sections, "ts_id", ts_id) + itkremove(train.il_sections, "ts_id", ts_id, not clear_all) -- ts if not ts.trains then ts.trains = {} end - itremove(ts.trains, tid) + itremove(ts.trains, tid, not clear_all) + -- route locks if ts.route_post then advtrains.interlocking.route.free_route_locks(ts_id, ts.route_post.locks) if ts.route_post.next then @@ -138,12 +154,18 @@ end -- This sets the section for both directions, to be failsafe advtrains.tnc_register_on_enter(function(pos, id, train, index) local tcb = ildb.get_tcb(pos) - if tcb then - for connid=1,2 do - local ts = tcb[connid].ts_id and ildb.get_ts(tcb[connid].ts_id) - if ts then - setsection(id, train, tcb[connid].ts_id, ts, {p=pos, s=connid}) - end + if tcb and train.path_cp[index] and train.path_cn[index] then + -- forward conn + local connid = train.path_cn[index] + local ts = tcb[connid] and tcb[connid].ts_id and ildb.get_ts(tcb[connid].ts_id) + if ts then + setsection(id, train, tcb[connid].ts_id, ts, {p=pos, s=connid}) + end + -- backward conn (safety only) + connid = train.path_cp[index] + ts = tcb[connid] and tcb[connid].ts_id and ildb.get_ts(tcb[connid].ts_id) + if ts then + setsection(id, train, tcb[connid].ts_id, ts, {p=pos, s=connid}, true) end end end) @@ -153,8 +175,9 @@ end) advtrains.tnc_register_on_leave(function(pos, id, train, index) local tcb = ildb.get_tcb(pos) if tcb and train.path_cp[index] then + -- backward conn local connid = train.path_cp[index] - local ts = tcb[connid].ts_id and ildb.get_ts(tcb[connid].ts_id) + local ts = tcb[connid] and tcb[connid].ts_id and ildb.get_ts(tcb[connid].ts_id) if ts then freesection(id, train, tcb[connid].ts_id, ts) end @@ -166,14 +189,14 @@ end) advtrains.te_register_on_create(function(id, train) -- let's see what track sections we find here local index = atround(train.index) - local pos = advtrains.path_get(train, index) - local ts_id, origin = ildb.get_ts_at_pos(pos) + local pos = advtrains.round_vector_floor_y(advtrains.path_get(train, index)) + local ts_id = ildb.check_and_repair_ts_at_pos(pos, 1) -- passing connid 1 - that always exists if ts_id then local ts = ildb.get_ts(ts_id) if ts then - setsection(id, train, ts_id, ts, origin) + setsection(id, train, ts_id, ts, nil, true) else - atwarn("ILDB corruption: TCB",origin," has invalid TS reference") + atwarn("While placing train, TS didnt exist ",ts_id) end -- Make train a shunt move train.is_shunt = true diff --git a/advtrains_interlocking/tsr_rail.lua b/advtrains_interlocking/tsr_rail.lua index f302540..5a808fc 100644 --- a/advtrains_interlocking/tsr_rail.lua +++ b/advtrains_interlocking/tsr_rail.lua @@ -3,13 +3,16 @@ -- Simple rail whose only purpose is to place a TSR on the position, as a temporary solution until the timetable system covers everything. -- This code resembles the code in lines/stoprail.lua +-- Get current translator +local S = advtrains.interlocking.translate + local function updateform(pos) local meta = minetest.get_meta(pos) local pe = advtrains.encode_pos(pos) local npr = advtrains.interlocking.npr_rails[pe] or 2 - meta:set_string("infotext", "Point speed restriction: "..npr) - meta:set_string("formspec", "field[npr;Set point speed restriction:;"..npr.."]") + meta:set_string("infotext", S("Point speed restriction: @1",npr)) + meta:set_string("formspec", "field[npr;"..S("Set point speed restriction:")..";"..npr.."]") end @@ -25,11 +28,11 @@ local adefunc = function(def, preset, suffix, rotation) on_receive_fields = function(pos, formname, fields, player) local pname = player:get_player_name() if not minetest.check_player_privs(pname, {interlocking=true}) then - minetest.chat_send_player(pname, "Interlocking privilege required!") + minetest.chat_send_player(pname, S("You are not allowed to configure this track without the @1 privilege.", "interlocking")) return end if minetest.is_protected(pos, pname) then - minetest.chat_send_player(pname, "This rail is protected!") + minetest.chat_send_player(pname, S("You are not allowed to configure this track.")) minetest.record_protection_violation(pos, pname) return end @@ -59,7 +62,7 @@ if minetest.get_modpath("advtrains_train_track") ~= nil then models_prefix="advtrains_dtrack", models_suffix=".b3d", shared_texture="advtrains_dtrack_shared_npr.png", - description="Point Speed Restriction Rail", + description=S("Point Speed Restriction Track"), formats={}, get_additional_definiton = adefunc, }, advtrains.trackpresets.t_30deg_straightonly) |
