Merge remote-tracking branch 'lemon-melon-repo/master'
commit
6ade65b6d6
|
@ -81,7 +81,7 @@ function advtrains.conway(midreal, prev, drives_on)--in order prev,mid,return
|
||||||
--dir2???
|
--dir2???
|
||||||
local cor2=advtrains.dirCoordSet(mid, middir1)--<<<<
|
local cor2=advtrains.dirCoordSet(mid, middir1)--<<<<
|
||||||
if math.floor(cor2.x+0.5)==math.floor(prev.x+0.5) and math.floor(cor2.z+0.5)==math.floor(prev.z+0.5) then
|
if math.floor(cor2.x+0.5)==math.floor(prev.x+0.5) and math.floor(cor2.z+0.5)==math.floor(prev.z+0.5) then
|
||||||
next=advtrains.dirCoordSet(mid, middir2)--dir2 wird überprüft, alles gut.
|
next=advtrains.dirCoordSet(mid, middir2)--dir2 wird überprüft, alles gut.
|
||||||
if midrely2>=1 then
|
if midrely2>=1 then
|
||||||
next.y=next.y+1
|
next.y=next.y+1
|
||||||
--atprint("found midrely2 to be >=1: next is now "..(next and minetest.pos_to_string(next) or "nil"))
|
--atprint("found midrely2 to be >=1: next is now "..(next and minetest.pos_to_string(next) or "nil"))
|
||||||
|
@ -170,7 +170,7 @@ function advtrains.minAngleDiffRad(r1, r2)
|
||||||
return try3
|
return try3
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function advtrains.dumppath(path)
|
function advtrains.dumppath(path)
|
||||||
atlog("Dumping a path:")
|
atlog("Dumping a path:")
|
||||||
if not path then atlog("dumppath: no path(nil)") return end
|
if not path then atlog("dumppath: no path(nil)") return end
|
||||||
|
@ -260,3 +260,7 @@ function advtrains.is_protected(pos, name)
|
||||||
end
|
end
|
||||||
return minetest.is_protected(pos, name)
|
return minetest.is_protected(pos, name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function advtrains.ms_to_kmh(speed)
|
||||||
|
return speed * 3.6
|
||||||
|
end
|
||||||
|
|
|
@ -116,11 +116,13 @@ function advtrains.hud_train_format(train, flip)
|
||||||
local max=train.max_speed or 10
|
local max=train.max_speed or 10
|
||||||
local vel=advtrains.abs_ceil(train.velocity)
|
local vel=advtrains.abs_ceil(train.velocity)
|
||||||
local tvel=advtrains.abs_ceil(train.tarvelocity)
|
local tvel=advtrains.abs_ceil(train.tarvelocity)
|
||||||
|
local vel_kmh=advtrains.abs_ceil(advtrains.ms_to_kmh(train.velocity))
|
||||||
|
local tvel_kmh=advtrains.abs_ceil(advtrains.ms_to_kmh(train.tarvelocity))
|
||||||
local topLine, firstLine, secondLine
|
local topLine, firstLine, secondLine
|
||||||
|
|
||||||
topLine=" ["..mletter[fct*train.movedir].."] "..doorstr[(train.door_open or 0) * train.movedir].." "..(train.brake and "="..( train.brake_hold_state==2 and "^" or "" ).."B=" or "")
|
topLine=" ["..mletter[fct*train.movedir].."] "..doorstr[(train.door_open or 0) * train.movedir].." "..(train.brake and "="..( train.brake_hold_state==2 and "^" or "" ).."B=" or "")
|
||||||
firstLine=attrans("Speed:").." |"..string.rep("+", vel)..string.rep("_", max-vel)..">"
|
firstLine=attrans("Speed:").." |"..string.rep("+", vel)..string.rep("_", max-vel).."> "..vel_kmh.." km/h"
|
||||||
secondLine=attrans("Target:").." |"..string.rep("+", tvel)..string.rep("_", max-tvel)..">"
|
secondLine=attrans("Target:").." |"..string.rep("+", tvel)..string.rep("_", max-tvel).."> "..tvel_kmh.." km/h"
|
||||||
|
|
||||||
return topLine.."\n"..firstLine.."\n"..secondLine
|
return topLine.."\n"..firstLine.."\n"..secondLine
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue