parent
e04c21be78
commit
112e3ff255
|
@ -149,7 +149,6 @@ minetest.register_entity("advtrains:couple", {
|
||||||
end
|
end
|
||||||
self.position_set=true
|
self.position_set=true
|
||||||
end
|
end
|
||||||
atprintbm("couple step", t)
|
|
||||||
advtrains.atprint_context_tid=nil
|
advtrains.atprint_context_tid=nil
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
|
@ -286,6 +286,7 @@ function tp.register_track_placer(nnprefix, imgprefix, dispname, def)
|
||||||
return itemstack, false
|
return itemstack, false
|
||||||
end
|
end
|
||||||
if minetest.registered_nodes[minetest.get_node(pos).name] and minetest.registered_nodes[minetest.get_node(pos).name].buildable_to then
|
if minetest.registered_nodes[minetest.get_node(pos).name] and minetest.registered_nodes[minetest.get_node(pos).name].buildable_to then
|
||||||
|
local s
|
||||||
if def.suitable_substrate then
|
if def.suitable_substrate then
|
||||||
s = def.suitable_substrate(upos)
|
s = def.suitable_substrate(upos)
|
||||||
else
|
else
|
||||||
|
|
|
@ -524,7 +524,7 @@ function advtrains.register_tracks(tracktype, def, preset)
|
||||||
end
|
end
|
||||||
ndef.on_rightclick = function(pos, node, player)
|
ndef.on_rightclick = function(pos, node, player)
|
||||||
if advtrains.check_turnout_signal_protection(pos, player:get_player_name()) then
|
if advtrains.check_turnout_signal_protection(pos, player:get_player_name()) then
|
||||||
advtrains.setstate(pos, newstate, node)
|
advtrains.setstate(pos, nil, node)
|
||||||
advtrains.log("Switch", player:get_player_name(), pos)
|
advtrains.log("Switch", player:get_player_name(), pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -667,7 +667,7 @@ function sl.create_slopeplacer_on_place(def, preset)
|
||||||
local yaw=player.get_look_horizontal and player:get_look_horizontal() or (player:get_look_yaw() - math.pi/2)
|
local yaw=player.get_look_horizontal and player:get_look_horizontal() or (player:get_look_yaw() - math.pi/2)
|
||||||
|
|
||||||
--rounding unit vectors is a nice way for selecting 1 of 8 directions since sin(30°) is 0.5.
|
--rounding unit vectors is a nice way for selecting 1 of 8 directions since sin(30°) is 0.5.
|
||||||
dirvec={x=math.floor(math.sin(-yaw)+0.5), y=0, z=math.floor(math.cos(-yaw)+0.5)}
|
local dirvec={x=math.floor(math.sin(-yaw)+0.5), y=0, z=math.floor(math.cos(-yaw)+0.5)}
|
||||||
--translate to direction to look up inside the preset table
|
--translate to direction to look up inside the preset table
|
||||||
local param2, rot45=({
|
local param2, rot45=({
|
||||||
[-1]={
|
[-1]={
|
||||||
|
|
|
@ -139,9 +139,12 @@ minetest.register_on_joinplayer(function(player)
|
||||||
advtrains.hhud[player:get_player_name()] = nil
|
advtrains.hhud[player:get_player_name()] = nil
|
||||||
--independent of this, cause all wagons of the train which are loaded to reattach their players
|
--independent of this, cause all wagons of the train which are loaded to reattach their players
|
||||||
--needed because already loaded wagons won't call reattach_all()
|
--needed because already loaded wagons won't call reattach_all()
|
||||||
for _,wagon in pairs(minetest.luaentities) do
|
local id=advtrains.player_to_train_mapping[pname]
|
||||||
if wagon.is_wagon and wagon.initialized and wagon.train_id==id then
|
if id then
|
||||||
wagon:reattach_all()
|
for _,wagon in pairs(minetest.luaentities) do
|
||||||
|
if wagon.is_wagon and wagon.initialized and wagon.train_id==id then
|
||||||
|
wagon:reattach_all()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -934,6 +934,7 @@ function wagon:show_bordcom(pname)
|
||||||
if not self:train() then return end
|
if not self:train() then return end
|
||||||
local train = self:train()
|
local train = self:train()
|
||||||
local data = advtrains.wagons[self.id]
|
local data = advtrains.wagons[self.id]
|
||||||
|
local linhei
|
||||||
|
|
||||||
local form = "size[11,9]label[0.5,0;AdvTrains Boardcom v0.1]"
|
local form = "size[11,9]label[0.5,0;AdvTrains Boardcom v0.1]"
|
||||||
form=form.."textarea[0.5,1.5;7,1;text_outside;"..attrans("Text displayed outside on train")..";"..(minetest.formspec_escape(train.text_outside or "")).."]"
|
form=form.."textarea[0.5,1.5;7,1;text_outside;"..attrans("Text displayed outside on train")..";"..(minetest.formspec_escape(train.text_outside or "")).."]"
|
||||||
|
|
|
@ -2,12 +2,8 @@
|
||||||
-- Lua automation features for advtrains
|
-- Lua automation features for advtrains
|
||||||
-- Uses global table 'atlatc' (AdvTrains_LuaATC)
|
-- Uses global table 'atlatc' (AdvTrains_LuaATC)
|
||||||
|
|
||||||
-- Boilerplate to support localized strings if intllib mod is installed.
|
--TODO: re-add localization (if merging localization, discard this hunk please)
|
||||||
if intllib then
|
atltrans = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end
|
||||||
atltrans = intllib.Getter()
|
|
||||||
else
|
|
||||||
atltrans = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end
|
|
||||||
end
|
|
||||||
|
|
||||||
--Privilege
|
--Privilege
|
||||||
--Only trusted players should be enabled to build stuff which can break the server.
|
--Only trusted players should be enabled to build stuff which can break the server.
|
||||||
|
|
Loading…
Reference in New Issue