aboutsummaryrefslogtreecommitdiff
path: root/advtrains_signals_ks/init.lua
diff options
context:
space:
mode:
Diffstat (limited to 'advtrains_signals_ks/init.lua')
-rwxr-xr-xadvtrains_signals_ks/init.lua138
1 files changed, 87 insertions, 51 deletions
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index 7e285ae..c91b4ec 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -11,10 +11,9 @@ local function asp_to_zs3type(asp)
return math.min(16,4*math.floor(n/4))
end
-local function setzs3(msp, lim, rot)
+local function setzs3(msp, asp, rot)
local pos = {x = msp.x, y = msp.y+1, z = msp.z}
local node = advtrains.ndb.get_node(pos)
- local asp = asp_to_zs3type(lim)
if node.name:find("^advtrains_signals_ks:zs3_") then
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:zs3_"..asp.."_"..rot, param2 = node.param2})
end
@@ -50,67 +49,106 @@ local function getzs3v(msp)
end
local setaspectf = function(rot)
- return function(pos, node, asp)
- setzs3(pos, asp.main, rot)
- if asp.main == 0 then
- if asp.shunt then
- advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_shunt_"..rot, param2 = node.param2})
- else
- advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
- end
+ return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
+ -- set zs3 signal to show speed according to main_aspect
+ setzs3(pos, asp.zs3, rot)
+ -- select appropriate lamps based on mainaspect and dst
+ if main_aspect.shunt then
+ advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_shunt_"..rot, param2 = node.param2})
+ setzs3v(pos, nil, rot)
+ elseif main_aspect.halt then
+ advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
setzs3v(pos, nil, rot)
else
- if not asp.dst or asp.dst == -1 then
+ if not dst_aspect_info
+ or not dst_aspect_info.main
+ or dst_aspect_info.main == -1 then
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_free_"..rot, param2 = node.param2})
- elseif asp.dst == 0 then
+ setzs3v(pos, nil, rot)
+ elseif dst_aspect_info.main == 0 then
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_slow_"..rot, param2 = node.param2})
+ setzs3v(pos, nil, rot)
else
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_nextslow_"..rot, param2 = node.param2})
+ setzs3v(pos, dst_aspect_info.main, rot)
end
- setzs3v(pos, asp.dst, rot)
end
end
end
-
-local suppasp = {
- main = {0, 4, 6, 8, 12, 16, -1},
- dst = {0, 4, 6, 8, 12, 16, -1, false},
- shunt = nil,
- proceed_as_main = true,
- info = {
- call_on = false,
- dead_end = false,
- w_speed = nil,
- }
+-- Main aspects main signal
+-- These aspects tell only the speed signalization at this signal.
+-- Actual signal aspect is chosen based on this and the Dst signal.
+local mainaspects_main = {
+ {
+ name = "proceed"
+ description = "Proceed",
+ zs3 = "off"
+ },
+ {
+ name = "shunt"
+ description = "Shunt",
+ zs3 = "off",
+ shunt = true,
+ },
+ {
+ name = "proceed_16"
+ description = "Proceed (speed 16)",
+ zs3 = "16",
+ },
+ {
+ name = "proceed_12"
+ description = "Proceed (speed 12)",
+ zs3 = "12",
+ },
+ {
+ name = "proceed_8"
+ description = "Proceed (speed 8)",
+ zs3 = "8",
+ },
+ {
+ name = "proceed_6"
+ description = "Proceed (speed 6)",
+ zs3 = "6",
+ },
+ {
+ name = "proceed_4"
+ description = "Proceed (speed 4)",
+ zs3 = "4",
+ },
+ {
+ name = "halt"
+ description = "Halt",
+ zs3 = "off",
+ halt = true,
+ },
}
--Rangiersignal
-local setaspectf_ra = function(rot)
- return function(pos, node, asp)
- if asp.shunt then
+local applyaspectf_ra = function(rot)
+ -- we get here the full main_aspect table
+ return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
+ if main_aspect.shunt then
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_shuntd_"..rot, param2 = node.param2})
else
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_danger_"..rot, param2 = node.param2})
end
- local meta = minetest.get_meta(pos)
- if meta then
- meta:set_string("infotext", minetest.serialize(asp))
- end
end
end
-local suppasp_ra = {
- main = { false },
- dst = { false },
- shunt = nil,
- proceed_as_main = false,
-
- info = {
- call_on = false,
- dead_end = false,
- w_speed = nil,
- }
+-- Main aspects shunt signal
+-- Shunt signals have only two states, distant doesn't matter
+local mainaspects_shunt = {
+ {
+ name = "shunt"
+ description = "Shunt",
+ shunt = true,
+ },
+ {
+ name = "halt"
+ description = "Halt",
+ halt = true,
+ },
}
advtrains.trackplacer.register_tracktype("advtrains_signals_ks:hs")
@@ -192,9 +230,9 @@ for _, rtab in ipairs({
drop = "advtrains_signals_ks:hs_danger_0",
inventory_image = "advtrains_signals_ks_hs_inv.png",
advtrains = {
- set_aspect = setaspectf(rot),
- supported_aspects = suppasp,
- get_aspect = afunc,
+ main_aspects = mainaspects_main
+ apply_aspect = applyaspectf_main(rot),
+ get_aspect_info = afunc,
},
on_rightclick = advtrains.interlocking.signal_rc_handler,
can_dig = advtrains.interlocking.signal_can_dig,
@@ -235,11 +273,9 @@ for _, rtab in ipairs({
drop = "advtrains_signals_ks:ra_danger_0",
inventory_image = "advtrains_signals_ks_ra_inv.png",
advtrains = {
- set_aspect = setaspectf_ra(rot),
- supported_aspects = suppasp_ra,
- get_aspect = function(pos, node)
- return prts.asp
- end,
+ main_aspects = mainaspects_ra,
+ apply_aspect = applyaspectf_ra(rot),
+ get_aspect_info = prts.asp,
},
on_rightclick = advtrains.interlocking.signal_rc_handler,
can_dig = advtrains.interlocking.signal_can_dig,
@@ -276,7 +312,7 @@ for _, rtab in ipairs({
drop = "advtrains_signals_ks:"..prefix.."_"..dtyp.."_0",
inventory_image = inv,
advtrains = {
- get_aspect = function() return asp end
+ get_aspect_info = asp
},
on_rightclick = advtrains.interlocking.signal_rc_handler,
can_dig = advtrains.interlocking.signal_can_dig,
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-22 05:42:02 +0000
Free Software Foundation, Inc., --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -------------------------------------------------------------------------------- local labels = { leaves = { fgettext("Opaque Leaves"), fgettext("Simple Leaves"), fgettext("Fancy Leaves") }, node_highlighting = { fgettext("Node Outlining"), fgettext("Node Highlighting"), fgettext("None") }, filters = { fgettext("No Filter"), fgettext("Bilinear Filter"), fgettext("Trilinear Filter") }, mipmap = { fgettext("No Mipmap"), fgettext("Mipmap"), fgettext("Mipmap + Aniso. Filter") }, antialiasing = { fgettext("None"), fgettext("2x"), fgettext("4x"), fgettext("8x") } } local dd_options = { leaves = { table.concat(labels.leaves, ","), {"opaque", "simple", "fancy"} }, node_highlighting = { table.concat(labels.node_highlighting, ","), {"box", "halo", "none"} }, filters = { table.concat(labels.filters, ","), {"", "bilinear_filter", "trilinear_filter"} }, mipmap = { table.concat(labels.mipmap, ","), {"", "mip_map", "anisotropic_filter"} }, antialiasing = { table.concat(labels.antialiasing, ","), {"0", "2", "4", "8"} } } local getSettingIndex = { Leaves = function() local style = core.settings:get("leaves_style") for idx, name in pairs(dd_options.leaves[2]) do if style == name then return idx end end return 1 end, NodeHighlighting = function() local style = core.settings:get("node_highlighting") for idx, name in pairs(dd_options.node_highlighting[2]) do if style == name then return idx end end return 1 end, Filter = function() if core.settings:get(dd_options.filters[2][3]) == "true" then return 3 elseif core.settings:get(dd_options.filters[2][3]) == "false" and core.settings:get(dd_options.filters[2][2]) == "true" then return 2 end return 1 end, Mipmap = function() if core.settings:get(dd_options.mipmap[2][3]) == "true" then return 3 elseif core.settings:get(dd_options.mipmap[2][3]) == "false" and core.settings:get(dd_options.mipmap[2][2]) == "true" then return 2 end return 1 end, Antialiasing = function() local antialiasing_setting = core.settings:get("fsaa") for i = 1, #dd_options.antialiasing[2] do if antialiasing_setting == dd_options.antialiasing[2][i] then return i end end return 1 end } local function antialiasing_fname_to_name(fname) for i = 1, #labels.antialiasing do if fname == labels.antialiasing[i] then return dd_options.antialiasing[2][i] end end return 0 end local function formspec(tabview, name, tabdata) local tab_string = "box[0,0;3.75,4.5;#999999]" .. "checkbox[0.25,0;cb_smooth_lighting;" .. fgettext("Smooth Lighting") .. ";" .. dump(core.settings:get_bool("smooth_lighting")) .. "]" .. "checkbox[0.25,0.5;cb_particles;" .. fgettext("Particles") .. ";" .. dump(core.settings:get_bool("enable_particles")) .. "]" .. "checkbox[0.25,1;cb_3d_clouds;" .. fgettext("3D Clouds") .. ";" .. dump(core.settings:get_bool("enable_3d_clouds")) .. "]" .. "checkbox[0.25,1.5;cb_opaque_water;" .. fgettext("Opaque Water") .. ";" .. dump(core.settings:get_bool("opaque_water")) .. "]" .. "checkbox[0.25,2.0;cb_connected_glass;" .. fgettext("Connected Glass") .. ";" .. dump(core.settings:get_bool("connected_glass")) .. "]" .. "dropdown[0.25,2.8;3.5;dd_node_highlighting;" .. dd_options.node_highlighting[1] .. ";" .. getSettingIndex.NodeHighlighting() .. "]" .. "dropdown[0.25,3.6;3.5;dd_leaves_style;" .. dd_options.leaves[1] .. ";" .. getSettingIndex.Leaves() .. "]" .. "box[4,0;3.75,4.5;#999999]" .. "label[4.25,0.1;" .. fgettext("Texturing:") .. "]" .. "dropdown[4.25,0.55;3.5;dd_filters;" .. dd_options.filters[1] .. ";" .. getSettingIndex.Filter() .. "]" .. "dropdown[4.25,1.35;3.5;dd_mipmap;" .. dd_options.mipmap[1] .. ";" .. getSettingIndex.Mipmap() .. "]" .. "label[4.25,2.15;" .. fgettext("Antialiasing:") .. "]" .. "dropdown[4.25,2.6;3.5;dd_antialiasing;" .. dd_options.antialiasing[1] .. ";" .. getSettingIndex.Antialiasing() .. "]" .. "label[4.25,3.45;" .. fgettext("Screen:") .. "]" .. "checkbox[4.25,3.6;cb_autosave_screensize;" .. fgettext("Autosave Screen Size") .. ";" .. dump(core.settings:get_bool("autosave_screensize")) .. "]" .. "box[8,0;3.75,4.5;#999999]" local video_driver = core.settings:get("video_driver") local shaders_supported = video_driver == "opengl" local shaders_enabled = false if shaders_supported then shaders_enabled = core.settings:get_bool("enable_shaders") tab_string = tab_string .. "checkbox[8.25,0;cb_shaders;" .. fgettext("Shaders") .. ";" .. tostring(shaders_enabled) .. "]" else core.settings:set_bool("enable_shaders", false) tab_string = tab_string .. "label[8.38,0.2;" .. core.colorize("#888888", fgettext("Shaders (unavailable)")) .. "]" end tab_string = tab_string .. "button[8,4.75;3.95,1;btn_change_keys;" .. fgettext("Change Keys") .. "]" tab_string = tab_string .. "button[0,4.75;3.95,1;btn_advanced_settings;" .. fgettext("All Settings") .. "]" if core.settings:get("touchscreen_threshold") ~= nil then tab_string = tab_string .. "label[4.3,4.2;" .. fgettext("Touchthreshold: (px)") .. "]" .. "dropdown[4.25,4.65;3.5;dd_touchthreshold;0,10,20,30,40,50;" .. ((tonumber(core.settings:get("touchscreen_threshold")) / 10) + 1) .. "]box[4.0,4.5;3.75,1.0;#999999]" end if shaders_enabled then tab_string = tab_string .. "checkbox[8.25,0.5;cb_bumpmapping;" .. fgettext("Bump Mapping") .. ";" .. dump(core.settings:get_bool("enable_bumpmapping")) .. "]" .. "checkbox[8.25,1;cb_tonemapping;" .. fgettext("Tone Mapping") .. ";" .. dump(core.settings:get_bool("tone_mapping")) .. "]" .. "checkbox[8.25,1.5;cb_parallax;" .. fgettext("Parallax Occlusion") .. ";" .. dump(core.settings:get_bool("enable_parallax_occlusion")) .. "]" .. "checkbox[8.25,2;cb_waving_water;" .. fgettext("Waving Liquids") .. ";" .. dump(core.settings:get_bool("enable_waving_water")) .. "]" .. "checkbox[8.25,2.5;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";" .. dump(core.settings:get_bool("enable_waving_leaves")) .. "]" .. "checkbox[8.25,3;cb_waving_plants;" .. fgettext("Waving Plants") .. ";" .. dump(core.settings:get_bool("enable_waving_plants")) .. "]" else tab_string = tab_string .. "label[8.38,0.7;" .. core.colorize("#888888", fgettext("Bump Mapping")) .. "]" .. "label[8.38,1.2;" .. core.colorize("#888888", fgettext("Tone Mapping")) .. "]" .. "label[8.38,1.7;" .. core.colorize("#888888", fgettext("Parallax Occlusion")) .. "]" .. "label[8.38,2.2;" .. core.colorize("#888888", fgettext("Waving Liquids")) .. "]" .. "label[8.38,2.7;" .. core.colorize("#888888", fgettext("Waving Leaves")) .. "]" .. "label[8.38,3.2;" .. core.colorize("#888888", fgettext("Waving Plants")) .. "]"