From c72d4770b8c8463ac6e3c737d03bf036dda77666 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 26 Aug 2016 18:13:16 +0200 Subject: Creating new switches, and adding lbms to finally abandon old rails --- models/advtrains_dtrack_swlcr.b3d | Bin 0 -> 36743 bytes models/advtrains_dtrack_swlcr_30.b3d | Bin 0 -> 45922 bytes models/advtrains_dtrack_swlcr_45.b3d | Bin 0 -> 32112 bytes models/advtrains_dtrack_swlcr_60.b3d | Bin 0 -> 44864 bytes models/advtrains_dtrack_swlst.b3d | Bin 0 -> 36743 bytes models/advtrains_dtrack_swlst_30.b3d | Bin 0 -> 45922 bytes models/advtrains_dtrack_swlst_45.b3d | Bin 0 -> 32112 bytes models/advtrains_dtrack_swlst_60.b3d | Bin 0 -> 44864 bytes models/advtrains_dtrack_swrcr.b3d | Bin 0 -> 36743 bytes models/advtrains_dtrack_swrcr_30.b3d | Bin 0 -> 44864 bytes models/advtrains_dtrack_swrcr_45.b3d | Bin 0 -> 32112 bytes models/advtrains_dtrack_swrcr_60.b3d | Bin 0 -> 45922 bytes models/advtrains_dtrack_swrst.b3d | Bin 0 -> 36743 bytes models/advtrains_dtrack_swrst_30.b3d | Bin 0 -> 44864 bytes models/advtrains_dtrack_swrst_45.b3d | Bin 0 -> 32112 bytes models/advtrains_dtrack_swrst_60.b3d | Bin 0 -> 45922 bytes models/blender/gleis/rail_my_rt_final_sw.blend1 | Bin 824996 -> 0 bytes models/blender/gleis/rail_my_rt_final_sw.blend11 | Bin 843380 -> 0 bytes models/blender/gleis/rail_my_rt_switches.blend | Bin 0 -> 2184236 bytes models/blender/gleis/rail_my_rt_switches.blend1 | Bin 0 -> 1945588 bytes models/blender/gleis/rail_my_rt_switches2.blend | Bin 0 -> 2139340 bytes models/blender/gleis/rail_my_rt_switches2.blend1 | Bin 0 -> 2172972 bytes tracks.lua | 41 +++++++++++++++++------ 23 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 models/advtrains_dtrack_swlcr.b3d create mode 100644 models/advtrains_dtrack_swlcr_30.b3d create mode 100644 models/advtrains_dtrack_swlcr_45.b3d create mode 100644 models/advtrains_dtrack_swlcr_60.b3d create mode 100644 models/advtrains_dtrack_swlst.b3d create mode 100644 models/advtrains_dtrack_swlst_30.b3d create mode 100644 models/advtrains_dtrack_swlst_45.b3d create mode 100644 models/advtrains_dtrack_swlst_60.b3d create mode 100644 models/advtrains_dtrack_swrcr.b3d create mode 100644 models/advtrains_dtrack_swrcr_30.b3d create mode 100644 models/advtrains_dtrack_swrcr_45.b3d create mode 100644 models/advtrains_dtrack_swrcr_60.b3d create mode 100644 models/advtrains_dtrack_swrst.b3d create mode 100644 models/advtrains_dtrack_swrst_30.b3d create mode 100644 models/advtrains_dtrack_swrst_45.b3d create mode 100644 models/advtrains_dtrack_swrst_60.b3d delete mode 100644 models/blender/gleis/rail_my_rt_final_sw.blend1 delete mode 100644 models/blender/gleis/rail_my_rt_final_sw.blend11 create mode 100644 models/blender/gleis/rail_my_rt_switches.blend create mode 100644 models/blender/gleis/rail_my_rt_switches.blend1 create mode 100644 models/blender/gleis/rail_my_rt_switches2.blend create mode 100644 models/blender/gleis/rail_my_rt_switches2.blend1 diff --git a/models/advtrains_dtrack_swlcr.b3d b/models/advtrains_dtrack_swlcr.b3d new file mode 100644 index 0000000..1adc23f Binary files /dev/null and b/models/advtrains_dtrack_swlcr.b3d differ diff --git a/models/advtrains_dtrack_swlcr_30.b3d b/models/advtrains_dtrack_swlcr_30.b3d new file mode 100644 index 0000000..7d8373b Binary files /dev/null and b/models/advtrains_dtrack_swlcr_30.b3d differ diff --git a/models/advtrains_dtrack_swlcr_45.b3d b/models/advtrains_dtrack_swlcr_45.b3d new file mode 100644 index 0000000..9679b9e Binary files /dev/null and b/models/advtrains_dtrack_swlcr_45.b3d differ diff --git a/models/advtrains_dtrack_swlcr_60.b3d b/models/advtrains_dtrack_swlcr_60.b3d new file mode 100644 index 0000000..3efc924 Binary files /dev/null and b/models/advtrains_dtrack_swlcr_60.b3d differ diff --git a/models/advtrains_dtrack_swlst.b3d b/models/advtrains_dtrack_swlst.b3d new file mode 100644 index 0000000..93841a4 Binary files /dev/null and b/models/advtrains_dtrack_swlst.b3d differ diff --git a/models/advtrains_dtrack_swlst_30.b3d b/models/advtrains_dtrack_swlst_30.b3d new file mode 100644 index 0000000..e9a90c7 Binary files /dev/null and b/models/advtrains_dtrack_swlst_30.b3d differ diff --git a/models/advtrains_dtrack_swlst_45.b3d b/models/advtrains_dtrack_swlst_45.b3d new file mode 100644 index 0000000..49c707c Binary files /dev/null and b/models/advtrains_dtrack_swlst_45.b3d differ diff --git a/models/advtrains_dtrack_swlst_60.b3d b/models/advtrains_dtrack_swlst_60.b3d new file mode 100644 index 0000000..c9a6ffe Binary files /dev/null and b/models/advtrains_dtrack_swlst_60.b3d differ diff --git a/models/advtrains_dtrack_swrcr.b3d b/models/advtrains_dtrack_swrcr.b3d new file mode 100644 index 0000000..ee29b62 Binary files /dev/null and b/models/advtrains_dtrack_swrcr.b3d differ diff --git a/models/advtrains_dtrack_swrcr_30.b3d b/models/advtrains_dtrack_swrcr_30.b3d new file mode 100644 index 0000000..ba065e1 Binary files /dev/null and b/models/advtrains_dtrack_swrcr_30.b3d differ diff --git a/models/advtrains_dtrack_swrcr_45.b3d b/models/advtrains_dtrack_swrcr_45.b3d new file mode 100644 index 0000000..7f9dc43 Binary files /dev/null and b/models/advtrains_dtrack_swrcr_45.b3d differ diff --git a/models/advtrains_dtrack_swrcr_60.b3d b/models/advtrains_dtrack_swrcr_60.b3d new file mode 100644 index 0000000..b8ffa61 Binary files /dev/null and b/models/advtrains_dtrack_swrcr_60.b3d differ diff --git a/models/advtrains_dtrack_swrst.b3d b/models/advtrains_dtrack_swrst.b3d new file mode 100644 index 0000000..0b3e7ad Binary files /dev/null and b/models/advtrains_dtrack_swrst.b3d differ diff --git a/models/advtrains_dtrack_swrst_30.b3d b/models/advtrains_dtrack_swrst_30.b3d new file mode 100644 index 0000000..4aea19b Binary files /dev/null and b/models/advtrains_dtrack_swrst_30.b3d differ diff --git a/models/advtrains_dtrack_swrst_45.b3d b/models/advtrains_dtrack_swrst_45.b3d new file mode 100644 index 0000000..4182fe5 Binary files /dev/null and b/models/advtrains_dtrack_swrst_45.b3d differ diff --git a/models/advtrains_dtrack_swrst_60.b3d b/models/advtrains_dtrack_swrst_60.b3d new file mode 100644 index 0000000..6d2c891 Binary files /dev/null and b/models/advtrains_dtrack_swrst_60.b3d differ 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 Binary files a/models/blender/gleis/rail_my_rt_final_sw.blend1 and /dev/null differ 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 Binary files a/models/blender/gleis/rail_my_rt_final_sw.blend11 and /dev/null differ 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 Binary files /dev/null and b/models/blender/gleis/rail_my_rt_switches.blend differ 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 Binary files /dev/null and b/models/blender/gleis/rail_my_rt_switches.blend1 differ 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 Binary files /dev/null and b/models/blender/gleis/rail_my_rt_switches2.blend differ 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 Binary files /dev/null and b/models/blender/gleis/rail_my_rt_switches2.blend1 differ 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 -- cgit v1.2.3