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

18 files changed, 37 insertions, 5 deletions

diff --git a/models/advtrains_dtrack_vst31.b3d b/models/advtrains_dtrack_vst31.b3d
new file mode 100644
index 0000000..df0f383
--- /dev/null
+++ b/models/advtrains_dtrack_vst31.b3d
diff --git a/models/advtrains_dtrack_vst32.b3d b/models/advtrains_dtrack_vst32.b3d
new file mode 100644
index 0000000..01d2978
--- /dev/null
+++ b/models/advtrains_dtrack_vst32.b3d
diff --git a/models/advtrains_dtrack_vst33.b3d b/models/advtrains_dtrack_vst33.b3d
new file mode 100644
index 0000000..7fe418d
--- /dev/null
+++ b/models/advtrains_dtrack_vst33.b3d
diff --git a/models/advtrains_engine_japan.b3d b/models/advtrains_engine_japan.b3d
new file mode 100644
index 0000000..5b97349
--- /dev/null
+++ b/models/advtrains_engine_japan.b3d
diff --git a/models/advtrains_wagon_japan.b3d b/models/advtrains_wagon_japan.b3d
new file mode 100644
index 0000000..9e5ac52
--- /dev/null
+++ b/models/advtrains_wagon_japan.b3d
diff --git a/models/blender/gleis/rail_verticals3.blend b/models/blender/gleis/rail_verticals3.blend
new file mode 100644
index 0000000..5d62959
--- /dev/null
+++ b/models/blender/gleis/rail_verticals3.blend
diff --git a/models/blender/gleis/rail_verticals3.blend1 b/models/blender/gleis/rail_verticals3.blend1
new file mode 100644
index 0000000..893f2ea
--- /dev/null
+++ b/models/blender/gleis/rail_verticals3.blend1
diff --git a/models/blender/mbb/advtrains_wagon_japan.xcf b/models/blender/mbb/advtrains_wagon_japan.xcf
new file mode 100644
index 0000000..4fc88c0
--- /dev/null
+++ b/models/blender/mbb/advtrains_wagon_japan.xcf
diff --git a/models/blender/mbb/modern_japanlocomotive.blend b/models/blender/mbb/modern_japanlocomotive.blend
new file mode 100644
index 0000000..f0b2714
--- /dev/null
+++ b/models/blender/mbb/modern_japanlocomotive.blend
diff --git a/models/blender/mbb/modern_japanlocomotive.blend1 b/models/blender/mbb/modern_japanlocomotive.blend1
new file mode 100644
index 0000000..4f75626
--- /dev/null
+++ b/models/blender/mbb/modern_japanlocomotive.blend1
diff --git a/models/blender/mbb/modern_japanlocomotive.png b/models/blender/mbb/modern_japanlocomotive.png
new file mode 100644
index 0000000..b80d16f
--- /dev/null
+++ b/models/blender/mbb/modern_japanlocomotive.png
diff --git a/models/blender/mbb/modern_japanlocomotive.xcf b/models/blender/mbb/modern_japanlocomotive.xcf
new file mode 100644
index 0000000..bb28534
--- /dev/null
+++ b/models/blender/mbb/modern_japanlocomotive.xcf
diff --git a/models/blender/mbb/modern_wagong_uv.png b/models/blender/mbb/modern_wagong_uv.png
new file mode 100644
index 0000000..68018ea
--- /dev/null
+++ b/models/blender/mbb/modern_wagong_uv.png
diff --git a/models/blender/mbb/tr-logo.png b/models/blender/mbb/tr-logo.png
new file mode 100644
index 0000000..9bc0f10
--- /dev/null
+++ b/models/blender/mbb/tr-logo.png
diff --git a/textures/advtrains_engine_japan.png b/textures/advtrains_engine_japan.png
new file mode 100644
index 0000000..b286b38
--- /dev/null
+++ b/textures/advtrains_engine_japan.png
diff --git a/textures/advtrains_wagon_japan.png b/textures/advtrains_wagon_japan.png
new file mode 100644
index 0000000..bee565e
--- /dev/null
+++ b/textures/advtrains_wagon_japan.png
diff --git a/tracks.lua b/tracks.lua
index 590f139..9a2b462 100644
--- a/tracks.lua
+++ b/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",

-		vst2="vertical upper node",

+		vst1="steep uphill 1/2",

+		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.

diff --git a/wagons.lua b/wagons.lua
index 540a882..47d7aae 100644
--- a/wagons.lua
+++ b/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",