diff options
| -rw-r--r-- | advtrains_line_automation/line_functions.lua | 32 | ||||
| -rw-r--r-- | advtrains_line_automation/station_editor.lua | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/advtrains_line_automation/line_functions.lua b/advtrains_line_automation/line_functions.lua index ef5d54c..9000517 100644 --- a/advtrains_line_automation/line_functions.lua +++ b/advtrains_line_automation/line_functions.lua @@ -147,13 +147,7 @@ local function line_start(train, stn, departure_rwtime, linevar) ls.linevar_last_dep = departure_rwtime ls.linevar_last_stn = stn ls.linevar_past = nil - train.text_outside = al.get_line_description(linevar_def, { - line_number = true, - last_stop = true, - last_stop_prefix = "", - last_stop_uppercase = true, - train_name = true, - }) + train.text_outside = al.get_line_display(linevar_def) return true end @@ -365,6 +359,19 @@ function al.get_terminus(linevar_def, current_index, allow_hidden_stops) return r_i, r_stop end +function al.get_line_display(linevar_def) + if linevar_def.train_name then + return linevar_def.train_name + end + + return core.get_translated_string("", al.get_line_description(linevar_def, { + line_number = true, + last_stop = true, + last_stop_prefix = "", + last_stop_uppercase = true, + })) +end + --[[ options = { line_number = bool or nil, -- zahrnout do popisu číslo linky? nil => false @@ -372,8 +379,6 @@ end last_stop = bool or nil, -- zahrnout do popisu název cílové zastávky? nil => true last_stop_prefix = string or nil, -- text před název cílové zastávky; nil => "⇒ " last_stop_uppercase = bool or nil, -- je-li true, název cílové zastávky se před uvedením převede na velká písmena - train_name = bool or nil, -- zahrnout do popisu jméno vlaku, je-li k dispozici; nil => false - train_name_prefix = string or nil, -- text před jméno vlaku; nil => "\n" } ]] function al.get_line_description(linevar_def, options) @@ -383,7 +388,7 @@ function al.get_line_description(linevar_def, options) return "???" end if options == nil then options = {} end - local s1, s2, s3, s4 + local s1, s2, s3 if options.line_number then s1 = "["..line.."] " else @@ -411,12 +416,7 @@ function al.get_line_description(linevar_def, options) s3 = "" end end - if options.train_name and linevar_def.train_name ~= nil then - s4 = (options.train_name_prefix or "\n")..linevar_def.train_name - else - s4 = "" - end - return s1..s2..s3..s4 + return s1..s2..s3 end function al.get_stop_description(stop_data, next_stop_data) diff --git a/advtrains_line_automation/station_editor.lua b/advtrains_line_automation/station_editor.lua index 0b20d45..fccc357 100644 --- a/advtrains_line_automation/station_editor.lua +++ b/advtrains_line_automation/station_editor.lua @@ -583,7 +583,7 @@ local function get_all_linevars() for linevar, linevar_def in pairs(stdata.linevars or empty_table) do local line, stn = advtrains.lines.linevar_decompose(linevar) local target_fs = F(advtrains.lines.get_line_description(linevar_def, {line_number = false, last_stop = true, last_stop_prefix = "", - last_stop_uppercase = false, train_name = false})) + last_stop_uppercase = false})) local status_fs if trains_by_linevar[linevar] ~= nil then status_fs = "#00ff00,"..S("in operation") @@ -613,7 +613,7 @@ end local function get_linevars_by_filter(stn_filter, track_filter) local result = {} local empty_table = {} - local line_description_options = {line_number = false, last_stop = true, last_stop_prefix = "", last_stop_uppercase = false, train_name = false} + local line_description_options = {line_number = false, last_stop = true, last_stop_prefix = "", last_stop_uppercase = false} local trains_by_linevar = advtrains.lines.get_trains_by_linevar() assert(stn_filter) if track_filter == "" then |