From 5ea11062a80b73e3a24ca43affd5167a1f597ebe Mon Sep 17 00:00:00 2001 From: Singularis Date: Sun, 12 Jan 2025 16:22:07 +0100 Subject: [ch_core,*] Funkce ch_core související s reálným a herním časem odděleny do samostatného módu ch_time. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- advtrains_line_automation/mod.conf | 2 +- advtrains_line_automation/railwaytime.lua | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/advtrains_line_automation/mod.conf b/advtrains_line_automation/mod.conf index e9851c8..9d6e9e8 100644 --- a/advtrains_line_automation/mod.conf +++ b/advtrains_line_automation/mod.conf @@ -4,4 +4,4 @@ description=Tools for automatic train lines author=orwell96 depends=advtrains_interlocking -optional_depends=advtrains_train_track +optional_depends=advtrains_train_track,ch_time diff --git a/advtrains_line_automation/railwaytime.lua b/advtrains_line_automation/railwaytime.lua index a5882bd..29ef110 100644 --- a/advtrains_line_automation/railwaytime.lua +++ b/advtrains_line_automation/railwaytime.lua @@ -311,23 +311,13 @@ end advtrains.lines.rwt = rwt --- chat command -if core.registered_chatcommands["cas"] then - local old_func = assert(core.registered_chatcommands["cas"].func) - local function new_func(player_name, param) - local result - if param == "ž+" or param == "z+" or param == "železniční+" or param == "zeleznicni+" then - local rwtime = rwt.get_time() - result = "železniční čas: "..rwt.to_string(rwtime).." ("..rwt.to_secs(rwtime)..")" - elseif param == "ž" or param == "z" or param == "železniční" or param == "zeleznicni" then - result = "železniční čas: "..rwt.to_string(rwt.get_time(), true) - else - return old_func(player_name, param) - end - old_func({player_name, result}) - return true - end - local override = {func = new_func} - core.override_chatcommand("čas", override) - core.override_chatcommand("cas", override) +if core.get_modpath("ch_time") then + ch_time.set_rwtime_callback(function() + local rwtime = rwt.get_time() + return { + secs = rwt.to_secs(rwtime), + string = rwt.to_string(rwtime, true), + string_extended = rwt.to_string(rwtime), + } + end) end -- cgit v1.2.3