Even more bugfixes

- add translations of all index values to invert_train
- fix on_leave_node callbacks not being called when train reverses
- fix callbacks on train creation and destruction
- Fix warning when saving ATC rail info
This commit is contained in:
orwell96 2017-02-04 21:07:18 +01:00
parent 61e48fff28
commit d4975a7003
4 changed files with 51 additions and 30 deletions

View File

@ -21,11 +21,11 @@ end
--general --general
function atc.send_command(pos) function atc.send_command(pos, par_tid)
local pts=minetest.pos_to_string(pos) local pts=minetest.pos_to_string(pos)
if atc.controllers[pts] then if atc.controllers[pts] then
--atprint("Called send_command at "..pts) --atprint("Called send_command at "..pts)
local train_id = advtrains.detector.on_node[pts] local train_id = par_tid or advtrains.detector.on_node[pts]
if train_id then if train_id then
if advtrains.trains[train_id] then if advtrains.trains[train_id] then
--atprint("send_command inside if: "..sid(train_id)) --atprint("send_command inside if: "..sid(train_id))
@ -131,7 +131,9 @@ advtrains.register_tracks("default", {
local pts=minetest.pos_to_string(pos) local pts=minetest.pos_to_string(pos)
local _, conn1=advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) local _, conn1=advtrains.get_rail_info_at(pos, advtrains.all_tracktypes)
atc.controllers[pts]={command=fields.command, arrowconn=conn1} atc.controllers[pts]={command=fields.command, arrowconn=conn1}
atc.send_command(pos) if advtrains.detector.on_node[pts] then
atc.send_command(pos)
end
end end
end, end,
advtrains = { advtrains = {

View File

@ -419,8 +419,6 @@ function advtrains.detector.enter_node(pos, train_id)
end end
function advtrains.detector.leave_node(pos, train_id) function advtrains.detector.leave_node(pos, train_id)
local ppos=advtrains.round_vector_floor_y(pos) local ppos=advtrains.round_vector_floor_y(pos)
local pts=minetest.pos_to_string(ppos)
advtrains.detector.on_node[pts]=nil
advtrains.detector.call_leave_callback(ppos, train_id) advtrains.detector.call_leave_callback(ppos, train_id)
end end
function advtrains.detector.stay_node(pos, train_id) function advtrains.detector.stay_node(pos, train_id)

View File

@ -275,7 +275,7 @@ function advtrains.train_step_a(id, train, dtime)
train.path[maxn+1]=vector.add(train.path[maxn], vector.subtract(train.path[maxn], train.path[maxn-1])) train.path[maxn+1]=vector.add(train.path[maxn], vector.subtract(train.path[maxn], train.path[maxn-1]))
end end
train.path_dist[maxn]=vector.distance(train.path[maxn+1], train.path[maxn]) train.path_dist[maxn]=vector.distance(train.path[maxn+1], train.path[maxn])
maxn=advtrains.maxN(train.path) maxn=maxn+1
end end
train.path_extent_max=maxn train.path_extent_max=maxn
@ -293,7 +293,7 @@ function advtrains.train_step_a(id, train, dtime)
train.path[minn-1]=vector.add(train.path[minn], vector.subtract(train.path[minn], train.path[minn+1])) train.path[minn-1]=vector.add(train.path[minn], vector.subtract(train.path[minn], train.path[minn+1]))
end end
train.path_dist[minn-1]=vector.distance(train.path[minn], train.path[minn-1]) train.path_dist[minn-1]=vector.distance(train.path[minn], train.path[minn-1])
minn=advtrains.minN(train.path) minn=minn-1
end end
train.path_extent_min=minn train.path_extent_min=minn
if not train.min_index_on_track then train.min_index_on_track=-1 end if not train.min_index_on_track then train.min_index_on_track=-1 end
@ -321,36 +321,46 @@ function advtrains.train_step_a(id, train, dtime)
-- when paths get cleared, the old indices set above will be up-to-date and represent the state in which the last run of this code was made -- when paths get cleared, the old indices set above will be up-to-date and represent the state in which the last run of this code was made
local ifo, ifn, ibo, ibn = train.detector_old_index, math.floor(train.index), train.detector_old_end_index, math.floor(train.end_index) local ifo, ifn, ibo, ibn = train.detector_old_index, math.floor(train.index), train.detector_old_end_index, math.floor(train.end_index)
local path=train.path local path=train.path
if train.enter_node_all then
for i=ibn, ifn do --field set by create_new_train_at.
if path[i] then --ensures that new train calls enter_node on all nodes
advtrains.detector.stay_node(path[i], id) for i=ibn, ifn do
end
end
if ifn>ifo then
for i=ifo+1, ifn do
if path[i] then if path[i] then
advtrains.detector.enter_node(path[i], id) advtrains.detector.enter_node(path[i], id)
end end
end end
elseif ifn<ifo then train.enter_node_all=nil
for i=ifn, ifo-1 do else
for i=ibn, ifn do
if path[i] then if path[i] then
advtrains.detector.leave_node(path[i], id) advtrains.detector.stay_node(path[i], id)
end end
end end
end
if ibn<ibo then if ifn>ifo then
for i=ibn, ibo-1 do for i=ifo+1, ifn do
if path[i] then if path[i] then
advtrains.detector.enter_node(path[i], id) advtrains.detector.enter_node(path[i], id)
end
end
elseif ifn<ifo then
for i=ifn+1, ifo do
if path[i] then
advtrains.detector.leave_node(path[i], id)
end
end end
end end
elseif ibn>ibo then if ibn<ibo then
for i=ibo+1, ibn do for i=ibn, ibo-1 do
if path[i] then if path[i] then
advtrains.detector.leave_node(path[i], id) advtrains.detector.enter_node(path[i], id)
end
end
elseif ibn>ibo then
for i=ibo, ibn-1 do
if path[i] then
advtrains.detector.leave_node(path[i], id)
end
end end
end end
end end
@ -463,6 +473,9 @@ function advtrains.create_new_train_at(pos, pos_prev)
advtrains.trains[newtrain_id].tarvelocity=0 advtrains.trains[newtrain_id].tarvelocity=0
advtrains.trains[newtrain_id].velocity=0 advtrains.trains[newtrain_id].velocity=0
advtrains.trains[newtrain_id].trainparts={} advtrains.trains[newtrain_id].trainparts={}
advtrains.trains[newtrain_id].enter_node_all=true
return newtrain_id return newtrain_id
end end
@ -600,6 +613,7 @@ function advtrains.split_train_at_wagon(wagon)
train.tarvelocity=0 train.tarvelocity=0
newtrain.velocity=train.velocity newtrain.velocity=train.velocity
newtrain.tarvelocity=0 newtrain.tarvelocity=0
newtrain.enter_node_all=true
end end
--there are 4 cases: --there are 4 cases:
@ -739,12 +753,19 @@ function advtrains.invert_train(train_id)
local train=advtrains.trains[train_id] local train=advtrains.trains[train_id]
local old_path=train.path local old_path=train.path
local old_path_dist=train.path_dist
train.path={} train.path={}
train.index= - advtrains.get_train_end_index(train) train.path_dist={}
train.index, train.end_index= -train.end_index, -train.index
train.path_extent_min, train.path_extent_max = -train.path_extent_max, -train.path_extent_min
train.min_index_on_track, train.max_index_on_track = -train.max_index_on_track, -train.min_index_on_track
train.detector_old_index, train.detector_old_end_index = -train.detector_old_end_index, -train.detector_old_index
train.velocity=-train.velocity train.velocity=-train.velocity
train.tarvelocity=-train.tarvelocity train.tarvelocity=-train.tarvelocity
for k,v in pairs(old_path) do for k,v in pairs(old_path) do
train.path[-k]=v train.path[-k]=v
train.path_dist[-k-1]=old_path_dist[k]
end end
local old_trainparts=train.trainparts local old_trainparts=train.trainparts
train.trainparts={} train.trainparts={}

View File

@ -42,8 +42,8 @@ function r.fire_event(pos, evtdata)
if atc_arrow==nil then if atc_arrow==nil then
atwarn("LuaAutomation ATC rail at", pos, ": Rail not on train's path! Can't determine arrow direction. Assuming +!") atwarn("LuaAutomation ATC rail at", pos, ": Rail not on train's path! Can't determine arrow direction. Assuming +!")
atc_arrow=true atc_arrow=true
tvel=train.velocity
end end
tvel=train.velocity
end end
local customfct={ local customfct={
atc_send = function(cmd) atc_send = function(cmd)