diff options
33 files changed, 81 insertions, 5 deletions
diff --git a/advtrains/tracks.lua b/advtrains/tracks.lua index 8b95c20..ca92bb4 100644 --- a/advtrains/tracks.lua +++ b/advtrains/tracks.lua @@ -163,12 +163,47 @@ advtrains.ap.t_30deg_slope={ vst31={conns = conns(8,0,0,0.33), rail_y = 0.16, desc = "uphill 1/3", slope=true}, vst32={conns = conns(8,0,0.33,0.66), rail_y = 0.5, desc = "uphill 2/3", slope=true}, vst33={conns = conns(8,0,0.66,1), rail_y = 0.83, desc = "uphill 3/3", slope=true}, + vst41={conns = conns(8,0,0,1/4), rail_y = 1/4 - 1/8, desc = "uphill 1/4", slope=true}, + vst42={conns = conns(8,0,1/4,2/4), rail_y = 2/4 - 1/8, desc = "uphill 2/4", slope=true}, + vst43={conns = conns(8,0,2/4,3/4), rail_y = 3/4 - 1/8, desc = "uphill 3/4", slope=true}, + vst44={conns = conns(8,0,3/4,1), rail_y = 1 - 1/8, desc = "uphill 4/4", slope=true}, + vst51={conns = conns(8,0,0,1/5), rail_y = 1/5 - 1/10, desc = "uphill 1/5", slope=true}, + vst52={conns = conns(8,0,1/5,2/5), rail_y = 2/5 - 1/10, desc = "uphill 2/5", slope=true}, + vst53={conns = conns(8,0,2/5,3/5), rail_y = 3/5 - 1/10, desc = "uphill 3/5", slope=true}, + vst54={conns = conns(8,0,3/5,4/5), rail_y = 4/5 - 1/10, desc = "uphill 4/5", slope=true}, + vst55={conns = conns(8,0,4/5,1), rail_y = 5/5 - 1/10, desc = "uphill 5/5", slope=true}, + vst61={conns = conns(8,0,0,1/6), rail_y = 1/6 - 1/12, desc = "uphill 1/6", slope=true}, + vst62={conns = conns(8,0,1/6,2/6), rail_y = 2/6 - 1/12, desc = "uphill 2/6", slope=true}, + vst63={conns = conns(8,0,2/6,3/6), rail_y = 3/6 - 1/12, desc = "uphill 3/6", slope=true}, + vst64={conns = conns(8,0,3/6,4/6), rail_y = 4/6 - 1/12, desc = "uphill 4/6", slope=true}, + vst65={conns = conns(8,0,4/6,5/6), rail_y = 5/6 - 1/12, desc = "uphill 5/6", slope=true}, + vst66={conns = conns(8,0,5/6,1), rail_y = 6/6 - 1/12, desc = "uphill 6/6", slope=true}, + vst71={conns = conns(8,0,0,1/7), rail_y = 1/7 - 1/14, desc = "uphill 1/7", slope=true}, + vst72={conns = conns(8,0,1/7,2/7), rail_y = 2/7 - 1/14, desc = "uphill 2/7", slope=true}, + vst73={conns = conns(8,0,2/7,3/7), rail_y = 3/7 - 1/14, desc = "uphill 3/7", slope=true}, + vst74={conns = conns(8,0,3/7,4/7), rail_y = 4/7 - 1/14, desc = "uphill 4/7", slope=true}, + vst75={conns = conns(8,0,4/7,5/7), rail_y = 5/7 - 1/14, desc = "uphill 5/7", slope=true}, + vst76={conns = conns(8,0,5/7,6/7), rail_y = 6/7 - 1/14, desc = "uphill 6/7", slope=true}, + vst77={conns = conns(8,0,6/7,1), rail_y = 7/7 - 1/14, desc = "uphill 7/7", slope=true}, + vst81={conns = conns(8,0,0,1/8), rail_y = 1/8 - 1/16, desc = "uphill 1/8", slope=true}, + vst82={conns = conns(8,0,1/8,2/8), rail_y = 2/8 - 1/16, desc = "uphill 2/8", slope=true}, + vst83={conns = conns(8,0,2/8,3/8), rail_y = 3/8 - 1/16, desc = "uphill 3/8", slope=true}, + vst84={conns = conns(8,0,3/8,4/8), rail_y = 4/8 - 1/16, desc = "uphill 4/8", slope=true}, + vst85={conns = conns(8,0,4/8,5/8), rail_y = 5/8 - 1/16, desc = "uphill 5/8", slope=true}, + vst86={conns = conns(8,0,5/8,6/8), rail_y = 6/8 - 1/16, desc = "uphill 6/8", slope=true}, + vst87={conns = conns(8,0,6/8,7/8), rail_y = 7/8 - 1/16, desc = "uphill 7/8", slope=true}, + vst88={conns = conns(8,0,7/8,1), rail_y = 8/8 - 1/16, desc = "uphill 8/8", slope=true}, }, regsp=true, slopeplacer={ [2]={"vst1", "vst2"}, [3]={"vst31", "vst32", "vst33"}, - max=3,--highest entry + [4]={"vst41", "vst42", "vst43", "vst44"}, + [5]={"vst51", "vst52", "vst53", "vst54", "vst55"}, + [6]={"vst61", "vst62", "vst63", "vst64", "vst65", "vst66"}, + [7]={"vst71", "vst72", "vst73", "vst74", "vst75", "vst76", "vst77"}, + [8]={"vst81", "vst82", "vst83", "vst84", "vst85", "vst86", "vst87", "vst88"}, + max=8,--highest entry }, slopeplacer_45={ [2]={"vst1_45", "vst2_45"}, @@ -720,7 +755,7 @@ function sl.create_slopeplacer_on_place(def, preset) pos=vector.add(pos, dirvec) end minetest.chat_send_player(player:get_player_name(), attrans("Can't place: no supporting node at upper end.")) - return itemstack + return istack end end diff --git a/advtrains_line_automation/stoprail.lua b/advtrains_line_automation/stoprail.lua index c63e5a9..33ca0cc 100644 --- a/advtrains_line_automation/stoprail.lua +++ b/advtrains_line_automation/stoprail.lua @@ -82,7 +82,7 @@ local function show_stoprailform(pos, player) local formspec = "formspec_version[4]".. "size[8,12]".. "item_image[0.25,0.25;1,1;advtrains_line_automation:dtrack_stop_placer]".. - "label[1.4,0.85;"..minetest.formspec_escape(item_name).."]".. + "textarea[1.35,0.6;5.5,0.6;;;"..minetest.formspec_escape(string.format("%s %d,%d,%d", item_name, pos.x, pos.y, pos.z)).."]".. "button_exit[7,0.25;0.75,0.75;close;X]".. "style[ars,line,routingcode;font=mono]".. "label[0.25,1.75;"..attrans("Station Code").." | "..attrans("Station Name").."]".. diff --git a/advtrains_train_track/init.lua b/advtrains_train_track/init.lua index 51a6469..5403ff7 100644 --- a/advtrains_train_track/init.lua +++ b/advtrains_train_track/init.lua @@ -147,6 +147,17 @@ minetest.register_craft({ ---- translate well to a block game. -- END crossings +advtrains.default_slope_formats = {t_30deg_slope = { + vst1={true, false, true}, + vst2={true, false, true}, + vst31={true}, vst32={true}, vst33={true}, + vst41={true}, vst42={true}, vst43={true}, vst44={true}, + vst51={true}, vst52={true}, vst53={true}, vst54={true}, vst55={true}, + vst61={true}, vst62={true}, vst63={true}, vst64={true}, vst65={true}, vst66={true}, + vst71={true}, vst72={true}, vst73={true}, vst74={true}, vst75={true}, vst76={true}, vst77={true}, + vst81={true}, vst82={true}, vst83={true}, vst84={true}, vst85={true}, vst86={true}, vst87={true}, vst88={true}, +}} + --slopes advtrains.register_tracks("default", { nodename_prefix="advtrains:dtrack", @@ -156,7 +167,7 @@ advtrains.register_tracks("default", { shared_texture="advtrains_dtrack_shared.png", second_texture="default_gravel.png", description=attrans("Track"), - formats={vst1={true, false, true}, vst2={true, false, true}, vst31={true}, vst32={true}, vst33={true}}, + formats=advtrains.default_slope_formats.t_30deg_slope, }, advtrains.ap.t_30deg_slope) minetest.register_craft({ @@ -177,7 +188,7 @@ advtrains.register_tracks("default", { shared_texture="advtrains_dtrack_shared.png", second_texture="default_gravel.png^[multiply:#956338", description=attrans("Track with Railway Gravel"), - formats={vst1={true, false, true}, vst2={true, false, true}, vst31={true}, vst32={true}, vst33={true}}, + formats=advtrains.default_slope_formats.t_30deg_slope, }, advtrains.ap.t_30deg_slope) minetest.register_craft({ diff --git a/advtrains_train_track/models/advtrains_dtrack_vst41.obj b/advtrains_train_track/models/advtrains_dtrack_vst41.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst41.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst42.obj b/advtrains_train_track/models/advtrains_dtrack_vst42.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst42.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst43.obj b/advtrains_train_track/models/advtrains_dtrack_vst43.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst43.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst44.obj b/advtrains_train_track/models/advtrains_dtrack_vst44.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst44.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst51.obj b/advtrains_train_track/models/advtrains_dtrack_vst51.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst51.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst52.obj b/advtrains_train_track/models/advtrains_dtrack_vst52.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst52.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst53.obj b/advtrains_train_track/models/advtrains_dtrack_vst53.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst53.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst54.obj b/advtrains_train_track/models/advtrains_dtrack_vst54.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst54.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst55.obj b/advtrains_train_track/models/advtrains_dtrack_vst55.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst55.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst61.obj b/advtrains_train_track/models/advtrains_dtrack_vst61.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst61.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst62.obj b/advtrains_train_track/models/advtrains_dtrack_vst62.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst62.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst63.obj b/advtrains_train_track/models/advtrains_dtrack_vst63.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst63.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst64.obj b/advtrains_train_track/models/advtrains_dtrack_vst64.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst64.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst65.obj b/advtrains_train_track/models/advtrains_dtrack_vst65.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst65.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst66.obj b/advtrains_train_track/models/advtrains_dtrack_vst66.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst66.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst71.obj b/advtrains_train_track/models/advtrains_dtrack_vst71.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst71.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst72.obj b/advtrains_train_track/models/advtrains_dtrack_vst72.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst72.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst73.obj b/advtrains_train_track/models/advtrains_dtrack_vst73.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst73.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst74.obj b/advtrains_train_track/models/advtrains_dtrack_vst74.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst74.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst75.obj b/advtrains_train_track/models/advtrains_dtrack_vst75.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst75.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst76.obj b/advtrains_train_track/models/advtrains_dtrack_vst76.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst76.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst77.obj b/advtrains_train_track/models/advtrains_dtrack_vst77.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst77.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst81.obj b/advtrains_train_track/models/advtrains_dtrack_vst81.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst81.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst82.obj b/advtrains_train_track/models/advtrains_dtrack_vst82.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst82.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst83.obj b/advtrains_train_track/models/advtrains_dtrack_vst83.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst83.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst84.obj b/advtrains_train_track/models/advtrains_dtrack_vst84.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst84.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst85.obj b/advtrains_train_track/models/advtrains_dtrack_vst85.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst85.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst86.obj b/advtrains_train_track/models/advtrains_dtrack_vst86.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst86.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst87.obj b/advtrains_train_track/models/advtrains_dtrack_vst87.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst87.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file diff --git a/advtrains_train_track/models/advtrains_dtrack_vst88.obj b/advtrains_train_track/models/advtrains_dtrack_vst88.obj new file mode 120000 index 0000000..d64044b --- /dev/null +++ b/advtrains_train_track/models/advtrains_dtrack_vst88.obj @@ -0,0 +1 @@ +advtrains_dtrack_vst31.obj
\ No newline at end of file |