Merge branch 'master' of https://github.com/orwell96/advtrains

tracks.lua

@@ -47,6 +47,9 @@ local t_30deg={
 		swrcr=conns(0,9),
 		vst1=conns(8,0,0,0.5,0.25),
 		vst2=conns(8,0,0.5,1,0.75),
+		vst31=conns(8,0,0,0.33,0.16),
+		vst32=conns(8,0,0.33,0.66,0.5),
+		vst33=conns(8,0,0.66,1,0.83),
 	},
 	description={
 		st="straight",
@@ -55,8 +58,11 @@ local t_30deg={
 		swlcr="left switch (curve)",
 		swrst="right switch (straight)",
 		swrcr="right switch (curve)",
-		vst1="vertical lower node",
+		vst1="steep uphill 1/2",
-		vst2="vertical upper node",
+		vst2="steep uphill 2/2",
+		vst31="uphill 1/3",
+		vst32="uphill 2/3",
+		vst33="uphill 3/3",
 	},
 	switch={
 		swlst="swlcr",
@@ -87,7 +93,7 @@ local t_30deg={
 		["swlst"]="swrst",
 	},
 	rotation={"", "_30", "_45", "_60"},
-	increativeinv={vst1=true, vst2=true},
+	increativeinv={vst1=true, vst2=true, vst31=true, vst32=true, vst33=true},
 }
 local t_45deg={
 	regstep=2,
@@ -319,7 +325,7 @@ advtrains.register_tracks("default", {
 	models_suffix=".b3d",
 	shared_texture="advtrains_dtrack_rail.png",
 	description="New Default Train Track",
-	formats={vst1={true, false, true}, vst2={true, false, true}},
+	formats={vst1={true, false, true}, vst2={true, false, true}, vst31={true}, vst32={true}, vst33={true}},
 }, t_30deg)
 
 --bumpers. temporary registration. later: integrate to register_tracks.

wagons.lua

@@ -445,7 +445,33 @@ advtrains.register_wagon("wagon_default", "steam",{
 	drops={"default:steelblock 4"},
 }, "Passenger Wagon", "advtrains_wagon_inv.png")
 
-advtrains.register_train_type("subway", {"regular", "default"})
+advtrains.register_train_type("electric", {"default"})
+
+advtrains.register_wagon("engine_japan", "electric",{
+	mesh="advtrains_engine_japan.b3d",
+	textures = {"advtrains_engine_japan.png"},
+	attach_offset={x=0, y=10, z=10},
+	view_offset={x=0, y=6, z=0},
+	visual_size = {x=1, y=1},
+	wagon_span=2,
+	is_locomotive=true,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Japanese Train Engine", "green.png")
+
+advtrains.register_wagon("wagon_japan", "electric",{
+	mesh="advtrains_wagon_japan.b3d",
+	textures = {"advtrains_wagon_japan.png"},
+	attach_offset={x=0, y=10, z=10},
+	view_offset={x=0, y=6, z=0},
+	visual_size = {x=1, y=1},
+	wagon_span=2,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Japanese Train Wagon", "blue.png")
+
+
+advtrains.register_train_type("subway", {"default"})
 
 advtrains.register_wagon("subway_wagon", "subway",{
 	mesh="advtrains_subway_train.b3d",