aboutsummaryrefslogtreecommitdiff
path: root/advtrains_luaautomation
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2021-11-02 23:14:28 +0100
committerorwell96 <orwell@bleipb.de>2021-11-02 23:14:28 +0100
commit35d5106a2141a3de83a8add3996ecc2dfbd141e7 (patch)
tree1d58d8db5fca4f0cd9afa19c9b259db8f6ee655d /advtrains_luaautomation
parent75025b13ca3b90c0ed284920ab0f294c54eeb697 (diff)
downloadadvtrains-35d5106a2141a3de83a8add3996ecc2dfbd141e7.tar.gz
advtrains-35d5106a2141a3de83a8add3996ecc2dfbd141e7.tar.bz2
advtrains-35d5106a2141a3de83a8add3996ecc2dfbd141e7.zip
LuaATC PCNaming: Allow naming active components using the tool
Diffstat (limited to 'advtrains_luaautomation')
-rw-r--r--advtrains_luaautomation/environment.lua2
-rw-r--r--advtrains_luaautomation/pcnaming.lua7
2 files changed, 7 insertions, 2 deletions
diff --git a/advtrains_luaautomation/environment.lua b/advtrains_luaautomation/environment.lua
index 63aa68d..e93b9c3 100644
--- a/advtrains_luaautomation/environment.lua
+++ b/advtrains_luaautomation/environment.lua
@@ -150,7 +150,7 @@ local static_env = {
--interrupts are handled per node, position unknown. (same goes for digilines)
--however external interrupts can be set here.
interrupt_pos = function(parpos, imesg)
- local pos=atlatc.pcnaming.resolve_pos(parpos)
+ local pos=atlatc.pcnaming.resolve_pos(parpos, "interrupt_pos")
atlatc.interrupt.add(0, pos, {type="ext_int", ext_int=true, message=imesg})
end,
-- sends an atc command to train regardless of where it is in the world
diff --git a/advtrains_luaautomation/pcnaming.lua b/advtrains_luaautomation/pcnaming.lua
index ebb769f..71f4d9a 100644
--- a/advtrains_luaautomation/pcnaming.lua
+++ b/advtrains_luaautomation/pcnaming.lua
@@ -44,7 +44,12 @@ minetest.register_craftitem("advtrains_luaautomation:pcnaming",{
return
end
local node = advtrains.ndb.get_node(pos)
- if node.name and (minetest.get_item_group(node.name, "advtrains_signal")>0 or advtrains.is_passive(pos)) then
+ local ndef = minetest.registered_nodes[node.name]
+ if node.name and (
+ minetest.get_item_group(node.name, "advtrains_signal")>0 --is IL signal
+ or advtrains.is_passive(pos) -- is passive component
+ or (ndef and ndef.luaautomation) -- is active component
+ ) then
--look if this one already has a name
local pn=""
for name, npos in pairs(atlatc.pcnaming.name_map) do