diff options
Diffstat (limited to 'advtrains_interlocking')
-rw-r--r-- | advtrains_interlocking/database.lua | 1 | ||||
-rw-r--r-- | advtrains_interlocking/distant_signals.lua | 19 | ||||
-rwxr-xr-x | advtrains_interlocking/tcb_ts_ui.lua | 15 |
3 files changed, 32 insertions, 3 deletions
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua index ee21db9..175e86f 100644 --- a/advtrains_interlocking/database.lua +++ b/advtrains_interlocking/database.lua @@ -197,6 +197,7 @@ TCB data structure route_auto = <boolean> -- When set, we will automatically re-set the route (designated by routeset) distant = { <sigd1> ... } -- a collection of sigd that points to a side of a TCB with a distant signal for this current signal. distant_of = { <sigd>, <index> } -- the reverse of the above field, along with the index of the entry in the list (for easier lookup) + distant_mode = <boolean|nil> -- distant signaling mode (see distant_signals.lua) }, -- This is the "B" side of the TCB [2] = { -- Variant: end of track-circuited area (initial state of TC) diff --git a/advtrains_interlocking/distant_signals.lua b/advtrains_interlocking/distant_signals.lua index 0da1c10..340cf74 100644 --- a/advtrains_interlocking/distant_signals.lua +++ b/advtrains_interlocking/distant_signals.lua @@ -1,3 +1,10 @@ +--[[ +Distant signaling modes: + true: set route for the next signal + false: do not set route for the next signal + nil: hide distant signal information +]] + local interlocking = advtrains.interlocking local ildb = advtrains.interlocking.db @@ -6,7 +13,11 @@ local function update_distant(tcbs) if not tcbs.aspect then tcbs.aspect = table.copy(interlocking.DANGER) end local asp = tcbs.aspect if tcbs.distant_of then - asp.dst = (ildb.get_tcbs(tcbs.distant_of[1]).aspect or interlocking.DANGER).main + if tcbs.distant_mode == nil then + asp.dst = nil + else + asp.dst = (ildb.get_tcbs(tcbs.distant_of[1]).aspect or interlocking.DANGER).main + end end interlocking.update_signal_aspect(tcbs) if tcbs.distant then @@ -14,7 +25,11 @@ local function update_distant(tcbs) for i = 1, #dst do local s = ildb.get_tcbs(dst[i]) if not s.aspect then s.aspect = table.copy(interlocking.DANGER) end - s.aspect.dst = asp.main + if s.distant_mode == nil then + s.aspect.dst = nil + else + s.aspect.dst = asp.main + end interlocking.update_signal_aspect(s) end end diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua index 2425bf2..f00016b 100755 --- a/advtrains_interlocking/tcb_ts_ui.lua +++ b/advtrains_interlocking/tcb_ts_ui.lua @@ -608,7 +608,7 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle if not tcbs.signal_name then tcbs.signal_name = "Signal at "..minetest.pos_to_string(sigd.p) end if not tcbs.routes then tcbs.routes = {} end - local form = "size[7,10]label[0.5,0.5;Signal at "..minetest.pos_to_string(sigd.p).."]" + local form = "size[7,11.5]label[0.5,0.5;Signal at "..minetest.pos_to_string(sigd.p).."]" form = form.."field[0.8,1.5;5.2,1;name;Signal name;"..minetest.formspec_escape(tcbs.signal_name).."]" form = form.."button[5.5,1.2;1,1;setname;Set]" @@ -675,6 +675,8 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle else form = form.."button[0.5,9;2.5,1;arsdisable;Disable ARS]" end + form = form.."checkbox[0.5,10;dstsignal;Enable distant signalling;"..(tcbs.distant_mode~=nil and "true" or "false").."]" + form = form.."checkbox[0.5,10.5;dstsetroute;Set route for the next signal;"..(tcbs.distant_mode and "true" or "false").."]" elseif sigd_equal(tcbs.route_origin, sigd) then -- something has gone wrong: tcbs.routeset should have been set... form = form.."label[0.5,2.5;Inconsistent state: route_origin is same TCBS but no route set. Try again.]" @@ -804,6 +806,17 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.noauto then tcbs.route_auto = false end + + if fields.dstsignal then + if minetest.is_yes(fields.dstsignal) then + tcbs.distant_mode = false + else + tcbs.distant_mode = nil + end + end + if fields.dstsetroute then + tcbs.distant_mode = not tcbs.distant_mode + end advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, true) return |