diff options
| -rw-r--r-- | advtrains/init.lua | 2 | ||||
| -rw-r--r-- | advtrains_line_automation/line_functions.lua | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/advtrains/init.lua b/advtrains/init.lua index 2b73f13..688f2a5 100644 --- a/advtrains/init.lua +++ b/advtrains/init.lua @@ -690,7 +690,7 @@ function advtrains.save(remove_players_from_wagons) if has_luaautomation and atlatc then atlatc.save() end - local message = "Saved advtrains save files, took",math.floor((os.clock()-t1) * 1000),"ms" + local message = "Saved advtrains save files, took "..tostring(math.floor((os.clock()-t1) * 1000)).."ms" if rwtime ~= nil then message = message.." rwtime="..rwtime end diff --git a/advtrains_line_automation/line_functions.lua b/advtrains_line_automation/line_functions.lua index eb8b9c3..168c1e7 100644 --- a/advtrains_line_automation/line_functions.lua +++ b/advtrains_line_automation/line_functions.lua @@ -958,7 +958,11 @@ local function vlaky(param, past_trains_too) train_line_prefix = param.."/" end local rwtime = rwt.to_secs(rwt.get_time()) + local players_per_train = {} local results = {} + for player_name, train_id in pairs(advtrains.player_to_train_mapping) do + results[train_id] = (results[train_id] or 0) + 1 + end for train_id, train in pairs(advtrains.trains) do local ls, linevar_def = al.get_line_status(train) if linevar_def ~= nil then @@ -970,13 +974,21 @@ local function vlaky(param, past_trains_too) end local s = "("..train_id..") ["..linevar_def.line.."] směr „"..direction.."“, poloha: ".. get_train_position(ls, linevar_def, rwtime) + if results[train_id] ~= nil then + s = s.." ["..results[train_id].." cestující/ch]" + end table.insert(results, {key = linevar_def.name.."/"..ls.linevar_index, value = s}) end elseif past_trains_too and ls.linevar_past ~= nil and (train_line_prefix == nil or ls.linevar_past.line == param) then local age = rwtime - ls.linevar_past.arrival + local s = "("..train_id..") ["..ls.linevar_past.line.."] služební, poloha: ".. + get_station_name(ls.linevar_past.station).." (před "..age.." sekundami)" + if results[train_id] ~= nil then + s = s.." ["..results[train_id].." cestující/ch]" + end table.insert(results, { key = string.format("%s/~/%s/%05d", ls.linevar_past.line, ls.linevar_past.station, age), - value = "("..train_id..") ["..ls.linevar_past.line.."] služební, poloha: "..get_station_name(ls.linevar_past.station).." (před "..age.." sekundami)", + value = s, }) end end |