diff options
| author | orwell96 <orwell@bleipb.de> | 2018-10-17 17:52:22 +0200 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2018-10-17 18:11:11 +0200 |
| commit | cd38b17eabb8cdc37bd7e11a89fd0fd049910ffc (patch) | |
| tree | c53253e996691583408b0fdad9679356571b5ae8 | |
| parent | c6bef1c358af39c25e0def8aa374e4474a6e334c (diff) | |
| download | advtrains-cd38b17eabb8cdc37bd7e11a89fd0fd049910ffc.tar.gz advtrains-cd38b17eabb8cdc37bd7e11a89fd0fd049910ffc.tar.bz2 advtrains-cd38b17eabb8cdc37bd7e11a89fd0fd049910ffc.zip | |
Address H#60, H#17, M#18 and M#7
duplicate "message" to "msg"
make operation panel "cracky"
remove inexistent dtime_s parameter
add bones:bones to the list of not_blocking_trains nodes
| -rw-r--r-- | advtrains/trainlogic.lua | 3 | ||||
| -rw-r--r-- | advtrains/wagons.lua | 2 | ||||
| -rw-r--r-- | advtrains_luaautomation/README.txt | 3 | ||||
| -rw-r--r-- | advtrains_luaautomation/active_common.lua | 2 | ||||
| -rw-r--r-- | advtrains_luaautomation/operation_panel.lua | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua index 4ca212f..6d903c5 100644 --- a/advtrains/trainlogic.lua +++ b/advtrains/trainlogic.lua @@ -1056,7 +1056,7 @@ function advtrains.invalidate_all_paths(pos) end end function advtrains.invalidate_path(id) - atdebug("Path invalidate:",id) + --atdebug("Path invalidate:",id) local v=advtrains.trains[id] if not v then return end advtrains.path_invalidate(v) @@ -1081,6 +1081,7 @@ local nonblocknodes={ "default:fence_pine_wood", "default:fence_junglewood", "default:torch", + "bones:bones", "default:sign_wall", "signs:sign_wall", diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua index c69b5e6..c532d30 100644 --- a/advtrains/wagons.lua +++ b/advtrains/wagons.lua @@ -107,7 +107,7 @@ function wagon:set_id(wid) minetest.after(0.2, function() self:reattach_all() end)
if self.custom_on_activate then
- self:custom_on_activate(dtime_s)
+ self:custom_on_activate()
end
end
diff --git a/advtrains_luaautomation/README.txt b/advtrains_luaautomation/README.txt index 0426ce9..279b07d 100644 --- a/advtrains_luaautomation/README.txt +++ b/advtrains_luaautomation/README.txt @@ -148,8 +148,9 @@ The Lua-controlled ATC rails are the only components that can actually interface {type="train", train=true, id="<train_id>"} This event is fired when a train enters the rail. The field 'id' is the unique train ID, which is 6-digit random numerical string. -{type="int", int=true, message=<message>} +{type="int", int=true, msg=<message>} Fired when an interrupt set by the 'interrupt' function runs out. 'message' is the message passed to the interrupt function. +For backwards compatiblity reasons, <message> is also contained in an event.message field. {type="ext_int", ext_int=true, message=<message>} Fired when another node called 'interrupt_pos' on this position. 'message' is the message passed to the interrupt_pos function. diff --git a/advtrains_luaautomation/active_common.lua b/advtrains_luaautomation/active_common.lua index d4cc0da..27255a3 100644 --- a/advtrains_luaautomation/active_common.lua +++ b/advtrains_luaautomation/active_common.lua @@ -115,7 +115,7 @@ function ac.run_in_env(pos, evtdata, customfct_p) customfct.interrupt=function(t, imesg) assertt(t, "number") assert(t >= 0) - atlatc.interrupt.add(t, pos, {type="int", int=true, message=imesg}) + atlatc.interrupt.add(t, pos, {type="int", int=true, message=imesg, msg=imesg}) --Compatiblity "message" field. end -- add digiline_send function, if digiline is loaded if minetest.global_exists("digiline") then diff --git a/advtrains_luaautomation/operation_panel.lua b/advtrains_luaautomation/operation_panel.lua index eb7201c..d0dd567 100644 --- a/advtrains_luaautomation/operation_panel.lua +++ b/advtrains_luaautomation/operation_panel.lua @@ -9,7 +9,7 @@ minetest.register_node("advtrains_luaautomation:oppanel", { tiles={"atlatc_oppanel.png"}, description = "LuaAutomation operation panel", groups = { - choppy = 1, + cracky = 1, save_in_nodedb=1, }, after_place_node = atlatc.active.after_place_node, |