diff options
| -rw-r--r-- | advtrains/couple.lua | 30 | ||||
| -rw-r--r-- | advtrains_interlocking/route_prog.lua | 14 | ||||
| -rw-r--r-- | advtrains_interlocking/tcb_ts_ui.lua | 14 |
3 files changed, 33 insertions, 25 deletions
diff --git a/advtrains/couple.lua b/advtrains/couple.lua index 49c8a5d..a4355ca 100644 --- a/advtrains/couple.lua +++ b/advtrains/couple.lua @@ -397,14 +397,16 @@ end local couple_max_dist=3 minetest.register_entity("advtrains:discouple", { - visual="sprite", - textures = {"advtrains_discouple.png"}, - collisionbox = {-0.3,-0.3,-0.3, 0.3,0.3,0.3}, - visual_size = {x=0.7, y=0.7}, - initial_sprite_basepos = {x=0, y=0}, - + initial_properties = { + visual="sprite", + textures = {"advtrains_discouple.png"}, + collisionbox = {-0.3,-0.3,-0.3, 0.3,0.3,0.3}, + visual_size = {x=0.7, y=0.7}, + initial_sprite_basepos = {x=0, y=0}, + static_save = false, + }, + is_discouple=true, - static_save = false, on_activate=function(self, staticdata) if staticdata=="DISCOUPLE" then --couple entities have no right to exist further... @@ -444,14 +446,16 @@ minetest.register_entity("advtrains:discouple", { -- Couple entity minetest.register_entity("advtrains:couple", { - visual="sprite", - textures = {"advtrains_couple.png"}, - collisionbox = {-0.3,-0.3,-0.3, 0.3,0.3,0.3}, - visual_size = {x=0.7, y=0.7}, - initial_sprite_basepos = {x=0, y=0}, + initial_properties = { + visual="sprite", + textures = {"advtrains_couple.png"}, + collisionbox = {-0.3,-0.3,-0.3, 0.3,0.3,0.3}, + visual_size = {x=0.7, y=0.7}, + initial_sprite_basepos = {x=0, y=0}, + static_save = false, + }, is_couple=true, - static_save = false, on_activate=function(self, staticdata) if staticdata=="COUPLE" then --couple entities have no right to exist further... diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua index ceb0c6a..cdc98c0 100644 --- a/advtrains_interlocking/route_prog.lua +++ b/advtrains_interlocking/route_prog.lua @@ -24,17 +24,19 @@ The route visualization will also be used to visualize routes after they have be local markerent = {} minetest.register_entity("advtrains_interlocking:routemarker", { - visual = "mesh", - mesh = "trackplane.b3d", - textures = {"at_il_route_set.png"}, - collisionbox = {-1,-0.5,-1, 1,-0.4,1}, - visual_size = {x=10, y=10}, + initial_properties = { + visual = "mesh", + mesh = "trackplane.b3d", + textures = {"at_il_route_set.png"}, + collisionbox = {-1,-0.5,-1, 1,-0.4,1}, + visual_size = {x=10, y=10}, + static_save = false, + }, on_punch = function(self) self.object:remove() end, get_staticdata = function() return "STATIC" end, on_activate = function(self, sdata) if sdata=="STATIC" then self.object:remove() end end, - static_save = false, }) diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua index 892ae73..d60879b 100644 --- a/advtrains_interlocking/tcb_ts_ui.lua +++ b/advtrains_interlocking/tcb_ts_ui.lua @@ -532,11 +532,14 @@ end) local markerent = {} minetest.register_entity("advtrains_interlocking:tcbmarker", { - visual = "mesh", - mesh = "trackplane.b3d", - textures = {"at_il_tcb_marker.png"}, - collisionbox = {-1,-0.5,-1, 1,-0.4,1}, - visual_size = {x=10, y=10}, + initial_properties = { + visual = "mesh", + mesh = "trackplane.b3d", + textures = {"at_il_tcb_marker.png"}, + collisionbox = {-1,-0.5,-1, 1,-0.4,1}, + visual_size = {x=10, y=10}, + static_save = false, + }, on_punch = function(self) self.object:remove() end, @@ -547,7 +550,6 @@ minetest.register_entity("advtrains_interlocking:tcbmarker", { end, get_staticdata = function() return "STATIC" end, on_activate = function(self, sdata) if sdata=="STATIC" then self.object:remove() end end, - static_save = false, }) function advtrains.interlocking.show_tcb_marker(pos) |