diff options
| -rw-r--r-- | advtrains_line_automation/line_functions.lua | 26 | ||||
| -rw-r--r-- | advtrains_line_automation/locale/advtrains_line_automation.de.tr | 2 | ||||
| -rw-r--r-- | advtrains_line_automation/po/de.po | 4 | ||||
| -rw-r--r-- | advtrains_line_automation/stoprail.lua | 178 |
4 files changed, 149 insertions, 61 deletions
diff --git a/advtrains_line_automation/line_functions.lua b/advtrains_line_automation/line_functions.lua index a3be879..4873b77 100644 --- a/advtrains_line_automation/line_functions.lua +++ b/advtrains_line_automation/line_functions.lua @@ -197,7 +197,8 @@ local function should_stop(pos, stdata, train) -- train not on a timetable local ars = stdata.ars -- vyhovuje vlak ARS pravidlům? - local result = ars and (ars.default or advtrains.interlocking.ars_check_rule_match(ars, train)) + local mspec,mdef = advtrains.interlocking.ars_check_rule_match(ars, train) + local result = (mspec or mdef) and true if result then return "true" else @@ -588,10 +589,26 @@ function al.get_line_status(train) return ls, linevar_def end +local function check_selector_ars(train, stdata) + local ars = stdata.selector_ars + if not ars then + return true + end + -- vyhovuje vlak ARS pravidlům? + local mspec,mdef = advtrains.interlocking.ars_check_rule_match(ars, train) + return (mspec or mdef) and true +end + function al.on_train_approach(pos, train_id, train, index) if train.path_cn[index] ~= 1 then return end -- špatný směr local pe = advtrains.encode_pos(pos) local stdata = advtrains.lines.stops[pe] + if stdata == nil then + return -- neplatná zastávka + end + if not check_selector_ars(train, stdata) then + return -- does not consider stop pos here + end if should_stop(pos, stdata, train) ~= nil then advtrains.lzb_add_checkpoint(train, index, 2, nil) if train.line_status.linevar == nil then @@ -630,6 +647,13 @@ function al.on_train_enter(pos, train_id, train, index) if train.path_cn[index] ~= 1 then return end -- špatný směr local pe = advtrains.encode_pos(pos) local stdata = advtrains.lines.stops[pe] + if stdata == nil then + return -- neplatná zastávka + end + if not check_selector_ars(train, stdata) then + return -- does not consider stop pos here + end + local stn = stdata.stn or "" local rwtime = assert(rwt.to_secs(rwt.get_time())) local ls, linevar_def = al.get_line_status(train) diff --git a/advtrains_line_automation/locale/advtrains_line_automation.de.tr b/advtrains_line_automation/locale/advtrains_line_automation.de.tr index 079e372..60b09db 100644 --- a/advtrains_line_automation/locale/advtrains_line_automation.de.tr +++ b/advtrains_line_automation/locale/advtrains_line_automation.de.tr @@ -9,7 +9,7 @@ Next Stop:@n=Nächste Haltestelle:@n Reverse train=Zug Umkehren Right=Rechts Save=Speichern -Station Code=Kennzeichen der Haltestelle +Station Code=Kennz. Station Name=Name der Haltestelle Station code "@1" already exists and is owned by @2.=Die Haltestelle mit dem Kennzeichen „@1“ ist bereits vorhanden und wird von @2 verwaltet. Station/Stop Track=Haltepunktgleis diff --git a/advtrains_line_automation/po/de.po b/advtrains_line_automation/po/de.po index de139bb..9b02b3b 100644 --- a/advtrains_line_automation/po/de.po +++ b/advtrains_line_automation/po/de.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: advtrains\n" "Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n" "POT-Creation-Date: 2025-06-11 23:01+0200\n" -"PO-Revision-Date: 2025-06-23 22:05+0200\n" +"PO-Revision-Date: 2025-07-22 22:22+0200\n" "Last-Translator: Y. Wang <yw05@forksworld.de>\n" "Language-Team: German\n" "Language: de\n" @@ -54,7 +54,7 @@ msgstr "Speichern" #: stoprail.lua msgid "Station Code" -msgstr "Kennzeichen der Haltestelle" +msgstr "Kennz." #: stoprail.lua msgid "Station Name" diff --git a/advtrains_line_automation/stoprail.lua b/advtrains_line_automation/stoprail.lua index d1d7c20..81f103a 100644 --- a/advtrains_line_automation/stoprail.lua +++ b/advtrains_line_automation/stoprail.lua @@ -34,11 +34,11 @@ local door_dropdown_code = {"L", "R", "C"} -- switch to numerical index of selec local function get_stn_dropdown(stn, player_name) local stations = advtrains.lines.load_stations_for_formspec() local selected_index - local result = {"dropdown[0.5,1.5;6.3,0.8;stn;(nepřiřazeno)"} + local result = {"dropdown[0.5,1.3;6.7,0.8;stn;"..S("(unassigned)")} local right_mark for i, st in ipairs(stations) do if player_name ~= nil and player_name ~= st.owner then - right_mark = "(cizí) " + right_mark = S("(foreign)") else right_mark = "" end @@ -51,6 +51,58 @@ local function get_stn_dropdown(stn, player_name) return table.concat(result) end +--[[ +formspec_version[6] +size[12,12.3] +label[0.5,0.5;Station/Stop Track -486\,3\,367] +style[ars,arr_action,dep_action;font=mono] +label[0.5,1.1;Station Code | Station Name] +dropdown[0.5,1.3;6.7,0.8;stn;(nepřiřazeno),Brp | Brpigcelerefern,Drp | Drpa,Hik | Hikieg,Kek | Kekonen,Log | Logremlake,ME | Memironpa,Orgp | Orgpen,Qrl | Quriblake,Shi | Shipcotio,Shr | Shiponrumott,Van | Vannde;8;true] +field[0.5,2.6;1.5,0.8;track;Track;2W] +tooltip[track;Track number\, for informational purposes] +button[3.5,2.3;3.7,1.1;editstn;Station Editor] +textarea[7.5,1.3;4,2.1;selector_ars;Position for (ARS);] +tooltip[selector_ars;Only trains matching these ARS rules will consider this stop rail as suitable timing point/stop position. Affects both timetabled and non-timetabled trains. Example: define a stop position for long trains (TL 30) and another for short trains (TL 0-30).] +tooltip[ars;Non-timetabled trains matching these ARS rules will stop at this position. Note: Train must also match the 'Position For' filter!] +button[7.5,1.3;4,0.8;selector_ars_enable;Selector for stop position...] +tooltip[selector_ars_enable;Use when multiple stop rails are located in the same track of a station. Allows to select a suitable stop position depending on the class of train.] +tooltip[ars;Non-timetabled trains matching these ARS rules will stop at this position. Trains under timetable will use the timetable's settings.] +textarea[0.5,4.3;4,1.3;ars;Stopping trains (ARS);] +field[0.5,6.1;1.5,0.8;wait;Stop Time;10] +tooltip[wait;Train will remain stopped with open doors for at least this time before departure is attempted.] +label[2.4,5.9;Door Side] +dropdown[2.4,6.1;1.9,0.8;doors;left,right,closed;2;true] +tooltip[doors;Select if and on which side the train will open its doors once stopped] +checkbox[0.5,7.3;reverse;Reverse train;false] +tooltip[reverse;Train will depart in the direction from where it arrived] +checkbox[0.5,7.9;kick;Kick out passengers;false] +checkbox[0.5,8.5;arskeepen;Keep ARS enabled;false] +tooltip[arskeepen;Do not disable ARS on approaching. Signals behind the stop rail already set ARS routes when the train arrives\, not just before departure. (currently not implemented)] +textarea[0.5,9.3;5.3,1.5;arr_action;Arrival Actions;<not yet implemented>] +tooltip[arr_action;List of actions to perform on arrival (currently not implemented\, later will allow actions such as setting line\, RC and displays)] +field[9.2,4.3;1.1,0.8;speed;Speed;M] +tooltip[speed;Speed that the train sets when departing. Set 'M' for maximum speed.] +label[6.2,4.1;Departure Mode] +dropdown[6.2,4.3;2.5,0.8;depmode;Normal,Interval,Begin Timetable;2;true] +tooltip[depmode;Select the time for departure: +Normal: depart immediately after the stop time elapsed +Interval: depart at the next time position set by interval and offset +Begin Timetable: The train gets the given timetable assigned and departs according to its settings (currently not implemented)] +field[6.2,5.6;1.8,0.8;interval;Interval:;60] +tooltip[interval;The interval / time distance between departures in seconds. E.g. every two minutes -> set interval = 120] +field[8.2,5.6;1.8,0.8;ioffset;Offset:;0] +tooltip[ioffset;The offset of departures from time 0:00 in seconds. E.g. interval 120 offset 60 -> departure at every odd minute] +checkbox[6.2,8.5;keepopen;Keep doors open;false] +tooltip[keepopen;Do not close the doors when departing\, if they are open] +checkbox[6.2,7.9;waitsig;Wait for signal to clear;true] +tooltip[waitsig;Do not depart immediately\, instead first enable ARS and wait until the next signal ahead clears (ATC G command) before closing the doors and departing.] +textarea[6.2,9.3;5.3,1.5;dep_action;Departure Actions;<not yet implemented>] +tooltip[dep_action;List of actions to perform on departure (currently not implemented\, later will allow actions such as setting line\, RC and displays)] +button_exit[0.5,11.2;11,0.8;save;Save] +box[0.5,3.6;11,0.1;#dddddd] +dropdown[6.2,6.6;3.8,0.8;linevar;asdf,dsdf;1;true] +]] +-- editor: https://luk3yx.gitlab.io/minetest-formspec-editor/ local depmode_to_dropdown = { normal=1, interval=2, ttbegin=3 } local dropdown_to_depmode = { "normal", "interval", "ttbegin" } @@ -86,78 +138,83 @@ local function show_stoprailform(pos, player) if not minetest.check_player_privs(pname, "train_admin") then pname_unless_admin = pname end - local formspec = "formspec_version[4]".. + local formspec = "formspec_version[6]".. "size[12,12.3]".. "label[0.5,0.5;"..minetest.formspec_escape(string.format("%s %d,%d,%d", item_name, pos.x, pos.y, pos.z)).."]".. - "style[ars,arr_action,dep_action;font=mono]".. - "label[0.5,1.25;"..S("Station Code").." | "..S("Station Name").."]".. + "style[ars,selector_ars,arr_action,dep_action;font=mono]".. + "label[0.5,1.1;"..S("Station Code").." | "..S("Station Name").."]".. get_stn_dropdown(player_to_stn_override[pname] or stdata.stn, pname_unless_admin).. - "field[7,1.5;1,0.8;track;"..S("Track")..";"..minetest.formspec_escape(stdata.track).."]".. + "field[0.5,2.6;1.5,0.8;track;"..S("Track")..";"..minetest.formspec_escape(stdata.track).."]".. "tooltip[track;"..S("Track number, for informational purposes").."]".. - (advtrains.lines.open_station_editor ~= nil and "button[8.2,1.5;3.3,0.8;editstn;"..S("Station Editor").."]" or "").. - -- filter/config - "textarea[0.5,3;6,2;ars;"..S("For trains (ARS rules)")..";"..advtrains.interlocking.ars_to_text(stdata.ars).."]".. - --"button[7,3;1,0.8;prev_config;<<]".. - --"button[10.5,3;1,0.8;next_config;>>]".. - --"dropdown[7,4;4.5,0.8;mode;Normal Stop,Pass Through<NI>,Inactive<NI>;1;true]".. - --"tooltip[mode;"..S("Select the operation mode:\nNormal Stop: Train stops, waits the specified time and departs\nPass Through: Train does not stop, but records this stop as a timing point\nInactive: The train ignores this stop rail.\nTimetables may override this setting.").."]".. + (advtrains.lines.open_station_editor ~= nil and "button[3.5,2.3;3.7,1.1;editstn;"..S("Station Editor").."]" or "") + if stdata.selector_ars then + formspec = formspec .. "textarea[7.5,1.3;4,2.1;selector_ars;"..S("Selector for stop pos (ARS)")..";"..advtrains.interlocking.ars_to_text(stdata.selector_ars).."]".. + "tooltip[selector_ars;"..S("Only trains matching these ARS rules will consider this stop rail as suitable timing point/stop position.\nAffects both timetabled and non-timetabled trains.\nExample: define a stop position for long trains (TL 30) and another for short trains (TL 0-30).").."]".. + "tooltip[ars;"..S("Non-timetabled trains matching these ARS rules will stop at this position.\nNote: Train must also match the 'Selector' filter above!").."]" + else + formspec = formspec .. "button[7.5,1.3;4,0.8;selector_ars_enable;"..S("Selector for stop position...").."]".. + "tooltip[selector_ars_enable;"..S("Use when multiple stop rails are located in the same track of a station. Allows to select a suitable stop position depending on the class of train.").."]".. + "tooltip[ars;"..S("Non-timetabled trains matching these ARS rules will stop at this position.\nTrains under timetable will use the timetable's settings.").."]" + end + -- separator line + formspec = formspec .. + "box[0.5,3.6;11,0.1;#dddddd]".. --arrival - "label[0.5,6;"..S("Arrive:").."]".. - "field[2,5.7;1.5,0.8;wait;"..S("Stop Time")..";"..stdata.wait.."]".. + "textarea[0.5,4.3;4,1.3;ars;"..S("Stopping trains (ARS)")..";"..advtrains.interlocking.ars_to_text(stdata.ars).."]".. + "field[0.5,6.1;1.5,0.8;wait;"..S("Stop Time")..";"..stdata.wait.."]".. "tooltip[wait;"..S("Train will remain stopped with open doors for at least this time before departure is attempted.").."]".. - "label[4,5.5;"..S("Door Side").."]".. - "dropdown[4,5.7;2.5,0.8;doors;"..S("left")..","..S("right")..","..S("closed")..";"..door_dropdown[stdata.doors]..";true]".. + "label[2.4,5.9;"..S("Door Side").."]".. + "dropdown[2.4,6.1;1.9,0.8;doors;"..S("left")..","..S("right")..","..S("closed")..";"..door_dropdown[stdata.doors]..";true]".. "tooltip[doors;"..S("Select if and on which side the train will open its doors once stopped").."]".. - "checkbox[7,5.9;reverse;"..S("Reverse train")..";"..(stdata.reverse and "true" or "false").."]".. + "checkbox[0.5,7.3;reverse;"..S("Reverse train")..";"..(stdata.reverse and "true" or "false").."]".. "tooltip[reverse;"..S("Train will depart in the direction from where it arrived").."]".. - "checkbox[7,6.6;kick;"..S("Kick out passengers")..";"..(stdata.kick and "true" or "false").."]".. - "checkbox[7,7.3;arskeepen;"..S("Keep ARS enabled")..";"..(stdata.arskeepen and "true" or "false").."]".. + "checkbox[0.5,7.9;kick;"..S("Kick out passengers")..";"..(stdata.kick and "true" or "false").."]".. + "checkbox[0.5,8.5;arskeepen;"..S("Keep ARS enabled")..";"..(stdata.arskeepen and "true" or "false").."]".. "tooltip[arskeepen;"..S("Do not disable ARS on approaching. Signals behind the stop rail already set ARS routes when the train arrives, not just before departure. (currently not implemented)").."]".. - --"textarea[0.5,7;6,1;arr_action;"..S("Arrival Actions")..";<not yet implemented>]".. - --"tooltip[arr_action;"..S("List of actions to perform on arrival (currently not implemented, later will allow actions such as setting line, RC and displays)").."]".. + "textarea[0.5,9.3;5.3,1.5;arr_action;"..S("Arrival Actions")..";<not yet implemented>]".. + "tooltip[arr_action;"..S("List of actions to perform on arrival (currently not implemented, later will allow actions such as setting line, RC and displays)").."]".. -- departure - "label[0.5,8.9;"..S("Depart:").."]".. - "field[2,8.6;1.5,0.8;speed;"..S("Speed")..";"..minetest.formspec_escape(stdata.speed).."]".. + "field[10.2,4.3;1.1,0.8;speed;"..S("Speed")..";"..minetest.formspec_escape(stdata.speed).."]".. "tooltip[speed;"..S("Speed that the train sets when departing. Set 'M' for maximum speed.").."]".. - "label[4,8.4;"..S("Departure Mode").."]".. - "dropdown[4,8.6;2.5,0.8;depmode;Normal,Interval,Begin Timetable;"..(depmode_to_dropdown[stdata.dep_mode] or 1)..";true]".. + "label[6.2,4.1;"..S("Departure Mode").."]".. + "dropdown[6.2,4.3;3.5,0.8;depmode;Normal,Interval,Begin Timetable;"..(depmode_to_dropdown[stdata.dep_mode] or 1)..";true]".. "tooltip[depmode;"..S("Select the time for departure:\nNormal: depart immediately after the stop time elapsed\nInterval: depart at the next time position set by interval and offset\nBegin Timetable: The train gets the given timetable assigned and departs according to its settings (currently not implemented)").."]" - if stdata.dep_mode == "interval" then - formspec = formspec .. "field[7,8.6;1.8,0.8;interval;"..S("Interval:")..";"..minetest.formspec_escape(stdata.interval or "").."]".. - "tooltip[interval;"..S("The interval / time distance between departures in seconds. E.g. every two minutes -> set interval = 120").."]".. - "field[9,8.6;1.8,0.8;ioffset;"..S("Offset:")..";"..minetest.formspec_escape(stdata.ioffset or "0").."]".. - "tooltip[ioffset;"..S("The offset of departures from time 0:00 in seconds. E.g. interval 120 offset 60 -> departure at every odd minute").."]" - elseif stdata.dep_mode == "ttbegin" then - formspec = formspec .. "field[7,8.6;0.9,0.8;interval;"..S("Interval:")..";"..minetest.formspec_escape(stdata.interval or "").."]".. - "tooltip[interval;"..S("The interval / time distance between departures in seconds. E.g. every two minutes -> set interval = 120").."]".. - "field[8,8.6;0.9,0.8;ioffset;"..S("Offset:")..";"..minetest.formspec_escape(stdata.ioffset or "0").."]".. - "tooltip[ioffset;"..S("The offset of departures from time 0:00 in seconds. E.g. interval 120 offset 60 -> departure at every odd minute").."]" - -- TODO: interval and offset should be defined in the timetable, not here - -- build list of available linevars (it is convenient that linevars are defined in the station) - local avail_linevars = {} - local sel_linevar = 1 - if stn and stn.linevars then - for k,_ in pairs(stn.linevars) do - table.insert(avail_linevars, k) - if stdata.tt_begin_linevar==k then sel_linevar = #avail_linevars end - end - end - if #avail_linevars > 0 then - formspec = formspec .. "label[9,8.4;"..S("TT Linevar:").."]".. - "dropdown[9,8.6;2.0,0.8;tt_begin_linevar;"..table.concat(avail_linevars)..";"..(sel_linevar or 1)..",false]" -- this dropdown NOT using indexing! - else - formspec = formspec .. "label[9,8.6;"..S("No linevars\navailable!").."]" + if stdata.dep_mode == "interval" then + formspec = formspec .. "field[6.2,5.6;1.8,0.8;interval;"..S("Interval:")..";"..minetest.formspec_escape(stdata.interval or "").."]".. + "tooltip[interval;"..S("The interval / time distance between departures in seconds. E.g. every two minutes -> set interval = 120").."]".. + "field[8.2,5.6;1.8,0.8;ioffset;"..S("Offset:")..";"..minetest.formspec_escape(stdata.ioffset or "0").."]".. + "tooltip[ioffset;"..S("The offset of departures from time 0:00 in seconds. E.g. interval 120 offset 60 -> departure at every odd minute").."]" + elseif stdata.dep_mode == "ttbegin" then + formspec = formspec .. "field[6.2,5.6;1.8,0.8;interval;"..S("Interval:")..";"..minetest.formspec_escape(stdata.interval or "").."]".. + "tooltip[interval;"..S("The interval / time distance between departures in seconds. E.g. every two minutes -> set interval = 120").."]".. + "field[8.2,5.6;1.8,0.8;ioffset;"..S("Offset:")..";"..minetest.formspec_escape(stdata.ioffset or "0").."]".. + "tooltip[ioffset;"..S("The offset of departures from time 0:00 in seconds. E.g. interval 120 offset 60 -> departure at every odd minute").."]" + -- TODO: interval and offset should be defined in the timetable, not here + -- build list of available linevars (it is convenient that linevars are defined in the station) + local avail_linevars = {} + local sel_linevar = 1 + if stn and stn.linevars then + for k,_ in pairs(stn.linevars) do + table.insert(avail_linevars, k) + if stdata.tt_begin_linevar==k then sel_linevar = #avail_linevars end end end - formspec = formspec .. "checkbox[7,10.6;keepopen;"..S("Keep doors open")..";"..(stdata.keepopen and "true" or "false").."]".. + if #avail_linevars > 0 then + formspec = formspec .. + "dropdown[6.2,6.6;3.8,0.8;tt_begin_linevar;"..table.concat(avail_linevars)..";"..(sel_linevar or 1)..",false]" -- this dropdown NOT using indexing! + else + formspec = formspec .. "label[6.2,6.6;"..S("No linevars\navailable!").."]" + end + end + formspec = formspec .. "checkbox[6.2,8.5;keepopen;"..S("Keep doors open")..";"..(stdata.keepopen and "true" or "false").."]".. "tooltip[keepopen;"..S("Do not close the doors when departing, if they are open").."]".. - "checkbox[7,9.9;waitsig;"..S("Wait for signal to clear")..";"..(stdata.waitsig and "true" or "false").."]".. + "checkbox[6.2,7.9;waitsig;"..S("Wait for signal to clear")..";"..(stdata.waitsig and "true" or "false").."]".. "tooltip[waitsig;"..S("Do not depart immediately, instead first enable ARS and wait until the next signal ahead clears (ATC G command) before closing the doors and departing.").."]".. - --"textarea[0.5,9.9;6,1;dep_action;"..S("Departure Actions")..";<not yet implemented>]".. - --"tooltip[dep_action;"..S("List of actions to perform on departure (currently not implemented, later will allow actions such as setting line, RC and displays)").."]".. + "textarea[6.2,9.3;5.3,1.5;dep_action;"..S("Departure Actions")..";<not yet implemented>]".. + "tooltip[dep_action;"..S("List of actions to perform on departure (currently not implemented, later will allow actions such as setting line, RC and displays)").."]".. -- end "button_exit[0.5,11.2;11,0.8;save;"..S("Save").."]" - + --atdebug(formspec) minetest.show_formspec(pname, "at_lines_stop_"..pe, formspec) end local tmp_checkboxes = {} @@ -198,7 +255,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end end - if fields.save or (fields.depmode and not fields.editstn) then -- must resend form when depmode dropdown is updated + if fields.save or (fields.depmode and not fields.editstn) or fields.selector_ars_enable then -- must resend form when depmode dropdown is updated or the selector enable button is pressed) local new_index = player_to_stn_override[pname] if new_index ~= nil then if new_index == 1 then @@ -237,6 +294,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.ars then stdata.ars = advtrains.interlocking.text_to_ars(fields.ars) end + + if fields.selector_ars then + stdata.selector_ars = advtrains.interlocking.text_to_ars(fields.selector_ars) + elseif fields.selector_ars_enable then + -- define selector_ars field + stdata.selector_ars = {default=true} + end stdata.ddelay = nil -- delete legacy field |