From 1d3e1cf073eb1edb2e50b78b6e05115fc8649174 Mon Sep 17 00:00:00 2001 From: Singularis Date: Wed, 1 Jan 2025 08:56:09 +0100 Subject: [advtrains] opravena chyba způsobující zasekávání kamery při jízdě vlakem některými směry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - [advtrains_line_automation] opraven pád serveru při zobrazení posledních jízd na lince za určitých okolností - [advtrains_line_automation] příkaz /vlaky nově bere v úvahu i zpoždění na příjezdu do následující zastávky - [ch_containers] vývoj --- advtrains_line_automation/line_functions.lua | 29 +++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'advtrains_line_automation/line_functions.lua') diff --git a/advtrains_line_automation/line_functions.lua b/advtrains_line_automation/line_functions.lua index aba7e01..e23bd6f 100644 --- a/advtrains_line_automation/line_functions.lua +++ b/advtrains_line_automation/line_functions.lua @@ -379,14 +379,37 @@ end text = string, } ]] -function al.get_delay_description(line_status, linevar_def) +function al.get_delay_description(line_status, linevar_def, rwtime) assert(line_status) if linevar_def == nil then return {text = ""} end - local expected_departure = line_status.linevar_dep + assert(linevar_def.stops[line_status.linevar_index]).dep + local stops = linevar_def.stops + local expected_departure = line_status.linevar_dep + assert(stops[line_status.linevar_index]).dep local real_departure = line_status.linevar_last_dep local delay = real_departure - expected_departure + + if rwtime ~= nil then + local expected_departure_next + for i = line_status.linevar_index + 1, #stops do + if stops[i] == nil then + break + else + local mode = stops[i].mode + if mode == nil or mode ~= MODE_DISABLED then + expected_departure_next = line_status.linevar_dep + stops[i].dep + break + end + end + end + if expected_departure_next ~= nil then + local delay2 = rwtime - expected_departure_next + if delay2 > delay then + delay = delay2 + end + end + end + if delay < -1 or delay > 10 then return { has_delay = true, @@ -851,7 +874,7 @@ local function get_train_position(line_status, linevar_def, rwtime) local last_pos = last_pos_info.last_pos if last_pos ~= nil then local result = "„"..get_station_name(last_pos.stn).."“" - local delay_info = al.get_delay_description(line_status, linevar_def) + local delay_info = al.get_delay_description(line_status, linevar_def, rwtime) if last_pos_info.type ~= "standing" then result = result.." (před "..(rwtime - last_pos.rwtime).." sekundami)" end -- cgit v1.2.3