Creating new switches, and adding lbms to finally abandon old rails

23 files changed, 31 insertions, 10 deletions

diff --git a/models/advtrains_dtrack_swlcr.b3d b/models/advtrains_dtrack_swlcr.b3d
new file mode 100644
index 0000000..1adc23f
--- /dev/null
+++ b/models/advtrains_dtrack_swlcr.b3d
diff --git a/models/advtrains_dtrack_swlcr_30.b3d b/models/advtrains_dtrack_swlcr_30.b3d
new file mode 100644
index 0000000..7d8373b
--- /dev/null
+++ b/models/advtrains_dtrack_swlcr_30.b3d
diff --git a/models/advtrains_dtrack_swlcr_45.b3d b/models/advtrains_dtrack_swlcr_45.b3d
new file mode 100644
index 0000000..9679b9e
--- /dev/null
+++ b/models/advtrains_dtrack_swlcr_45.b3d
diff --git a/models/advtrains_dtrack_swlcr_60.b3d b/models/advtrains_dtrack_swlcr_60.b3d
new file mode 100644
index 0000000..3efc924
--- /dev/null
+++ b/models/advtrains_dtrack_swlcr_60.b3d
diff --git a/models/advtrains_dtrack_swlst.b3d b/models/advtrains_dtrack_swlst.b3d
new file mode 100644
index 0000000..93841a4
--- /dev/null
+++ b/models/advtrains_dtrack_swlst.b3d
diff --git a/models/advtrains_dtrack_swlst_30.b3d b/models/advtrains_dtrack_swlst_30.b3d
new file mode 100644
index 0000000..e9a90c7
--- /dev/null
+++ b/models/advtrains_dtrack_swlst_30.b3d
diff --git a/models/advtrains_dtrack_swlst_45.b3d b/models/advtrains_dtrack_swlst_45.b3d
new file mode 100644
index 0000000..49c707c
--- /dev/null
+++ b/models/advtrains_dtrack_swlst_45.b3d
diff --git a/models/advtrains_dtrack_swlst_60.b3d b/models/advtrains_dtrack_swlst_60.b3d
new file mode 100644
index 0000000..c9a6ffe
--- /dev/null
+++ b/models/advtrains_dtrack_swlst_60.b3d
diff --git a/models/advtrains_dtrack_swrcr.b3d b/models/advtrains_dtrack_swrcr.b3d
new file mode 100644
index 0000000..ee29b62
--- /dev/null
+++ b/models/advtrains_dtrack_swrcr.b3d
diff --git a/models/advtrains_dtrack_swrcr_30.b3d b/models/advtrains_dtrack_swrcr_30.b3d
new file mode 100644
index 0000000..ba065e1
--- /dev/null
+++ b/models/advtrains_dtrack_swrcr_30.b3d
diff --git a/models/advtrains_dtrack_swrcr_45.b3d b/models/advtrains_dtrack_swrcr_45.b3d
new file mode 100644
index 0000000..7f9dc43
--- /dev/null
+++ b/models/advtrains_dtrack_swrcr_45.b3d
diff --git a/models/advtrains_dtrack_swrcr_60.b3d b/models/advtrains_dtrack_swrcr_60.b3d
new file mode 100644
index 0000000..b8ffa61
--- /dev/null
+++ b/models/advtrains_dtrack_swrcr_60.b3d
diff --git a/models/advtrains_dtrack_swrst.b3d b/models/advtrains_dtrack_swrst.b3d
new file mode 100644
index 0000000..0b3e7ad
--- /dev/null
+++ b/models/advtrains_dtrack_swrst.b3d
diff --git a/models/advtrains_dtrack_swrst_30.b3d b/models/advtrains_dtrack_swrst_30.b3d
new file mode 100644
index 0000000..4aea19b
--- /dev/null
+++ b/models/advtrains_dtrack_swrst_30.b3d
diff --git a/models/advtrains_dtrack_swrst_45.b3d b/models/advtrains_dtrack_swrst_45.b3d
new file mode 100644
index 0000000..4182fe5
--- /dev/null
+++ b/models/advtrains_dtrack_swrst_45.b3d
diff --git a/models/advtrains_dtrack_swrst_60.b3d b/models/advtrains_dtrack_swrst_60.b3d
new file mode 100644
index 0000000..6d2c891
--- /dev/null
+++ b/models/advtrains_dtrack_swrst_60.b3d
diff --git a/models/blender/gleis/rail_my_rt_final_sw.blend1 b/models/blender/gleis/rail_my_rt_final_sw.blend1
deleted file mode 100644
index 1d37fa7..0000000
--- a/models/blender/gleis/rail_my_rt_final_sw.blend1
+++ /dev/null
diff --git a/models/blender/gleis/rail_my_rt_final_sw.blend11 b/models/blender/gleis/rail_my_rt_final_sw.blend11
deleted file mode 100644
index 7372d51..0000000
--- a/models/blender/gleis/rail_my_rt_final_sw.blend11
+++ /dev/null
diff --git a/models/blender/gleis/rail_my_rt_switches.blend b/models/blender/gleis/rail_my_rt_switches.blend
new file mode 100644
index 0000000..fdce427
--- /dev/null
+++ b/models/blender/gleis/rail_my_rt_switches.blend
diff --git a/models/blender/gleis/rail_my_rt_switches.blend1 b/models/blender/gleis/rail_my_rt_switches.blend1
new file mode 100644
index 0000000..04370ba
--- /dev/null
+++ b/models/blender/gleis/rail_my_rt_switches.blend1
diff --git a/models/blender/gleis/rail_my_rt_switches2.blend b/models/blender/gleis/rail_my_rt_switches2.blend
new file mode 100644
index 0000000..9562e4d
--- /dev/null
+++ b/models/blender/gleis/rail_my_rt_switches2.blend
diff --git a/models/blender/gleis/rail_my_rt_switches2.blend1 b/models/blender/gleis/rail_my_rt_switches2.blend1
new file mode 100644
index 0000000..07a155f
--- /dev/null
+++ b/models/blender/gleis/rail_my_rt_switches2.blend1
diff --git a/tracks.lua b/tracks.lua
index 73d3033..d9deb5c 100644
--- a/tracks.lua
+++ b/tracks.lua
@@ -1,5 +1,12 @@
 --advtrains by orwell96, see readme.txt

 

+--dev-time settings:

+--EDIT HERE

+--If the old non-model rails on straight tracks should be replaced by the new...

+--false: no

+--true: yes

+advtrains.register_straight_rep_lbm=true

+

 --[[TracksDefinition

 nodename_prefix

 texture_prefix

@@ -279,7 +286,7 @@ advtrains.register_tracks("default", {
 	models_suffix=".b3d",

 	shared_texture="advtrains_dtrack_rail.png",

 	description="New Default Train Track",

-	formats={vst1={true}, vst2={true}, swlcr={}, swlst={}, swrcr={}, swrst={}},

+	formats={vst1={true}, vst2={true}},

 }, t_30deg)

 

 --TODO legacy

@@ -301,20 +308,34 @@ for name,rep in pairs({swl_st="swlst", swr_st="swrst", swl_cr="swlcr", swr_cr="s
     })

 end

 

-minetest.register_abm({

+minetest.register_lbm({

+	name = "advtrains:ramp_replacement_1",

 --  In the following two fields, also group:groupname will work.

 	nodenames = {"advtrains:track_vert1"},

-   interval = 1.0, -- Operation interval in seconds

-   chance = 1, -- Chance of trigger per-node per-interval is 1.0 / this

-   action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_vst1", param2=(node.param2+2)%4}) end,

+	action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_vst1", param2=(node.param2+2)%4}) end,

 })

-minetest.register_abm({

---  In the following two fields, also group:groupname will work.

+minetest.register_lbm({

+	name = "advtrains:ramp_replacement_1",

+--  --  In the following two fields, also group:groupname will work.

 	nodenames = {"advtrains:track_vert2"},

-   interval = 1.0, -- Operation interval in seconds

-   chance = 1, -- Chance of trigger per-node per-interval is 1.0 / this

-   action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_vst2", param2=(node.param2+2)%4}) end,

+	action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_vst2", param2=(node.param2+2)%4}) end,

 })

+if advtrains.register_straight_rep_lbm then

+	minetest.register_abm({

+		name = "advtrains:st_rep_1",

+	--  In the following two fields, also group:groupname will work.

+		nodenames = {"advtrains:track_st"},

+		interval=1,

+		chance=1,

+		action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_st", param2=node.param2}) end,

+	})

+	minetest.register_lbm({

+		name = "advtrains:st_rep_1",

+	--  --  In the following two fields, also group:groupname will work.

+		nodenames = {"advtrains:track_st_45"},

+		action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_st_45", param2=node.param2}) end,

+	})

+end