Create new models and textures for japanese train

24 files changed, 26 insertions, 6 deletions

diff --git a/advtrains/advtrains_train_japan/init.lua b/advtrains/advtrains_train_japan/init.lua
index a0c82cd..ad26fd1 100644
--- a/advtrains/advtrains_train_japan/init.lua
+++ b/advtrains/advtrains_train_japan/init.lua
@@ -14,10 +14,20 @@ advtrains.register_wagon("engine_japan", {
 		{
 			name=S("Driver stand"),
 			attach_offset={x=0, y=10, z=0},
-			view_offset={x=0, y=6, z=0},
+			view_offset={x=0, y=0, z=0},
 			driving_ctrl_access=true,
 		},
 	},
+	doors={
+		open={
+			[-1]={frames={x=0, y=20}, time=1},
+			[1]={frames={x=40, y=60}, time=1}
+		},
+		close={
+			[-1]={frames={x=20, y=40}, time=1},
+			[1]={frames={x=60, y=80}, time=1}
+		}
+	},
 	visual_size = {x=1, y=1},
 	wagon_span=2.5,
 	is_locomotive=true,
@@ -34,8 +44,18 @@ advtrains.register_wagon("wagon_japan", {
 		{
 			name=S("Default Seat"),
 			attach_offset={x=0, y=10, z=0},
-			view_offset={x=0, y=6, z=0},
+			view_offset={x=0, y=0, z=0},
+		},
+	},
+	doors={
+		open={
+			[-1]={frames={x=0, y=20}, time=1},
+			[1]={frames={x=40, y=60}, time=1}
 		},
+		close={
+			[-1]={frames={x=20, y=40}, time=1},
+			[1]={frames={x=60, y=80}, time=1}
+		}
 	},
 	visual_size = {x=1, y=1},
 	wagon_span=2.3,
diff --git a/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d b/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d
index f82c33e..218d965 100644
--- a/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d
+++ b/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d
diff --git a/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d b/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d
index 7970438..e6263dd 100644
--- a/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d
+++ b/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d
diff --git a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png b/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png
index b286b38..2bc5fb8 100644
--- a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png
+++ b/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png
diff --git a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png b/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png
index bee565e..c9cddc8 100644
--- a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png
+++ b/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png
diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua
index 53e0a70..766081e 100644
--- a/advtrains/advtrains_train_subway/init.lua
+++ b/advtrains/advtrains_train_subway/init.lua
@@ -20,12 +20,12 @@ advtrains.register_wagon("subway_wagon", {
 	},
 	doors={
 		open={
-			[-1]={frames={x=0, y=19}, time=1},
-			[1]={frames={x=40, y=59}, time=1}
+			[-1]={frames={x=0, y=20}, time=1},
+			[1]={frames={x=40, y=60}, time=1}
 		},
 		close={
-			[-1]={frames={x=20, y=39}, time=1},
-			[1]={frames={x=60, y=81}, time=1}
+			[-1]={frames={x=20, y=40}, time=1},
+			[1]={frames={x=60, y=80}, time=1}
 		}
 	},
 	visual_size = {x=1, y=1},
diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d
index 8f35769..cbd0f8e 100644
--- a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d
+++ b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d
diff --git a/assets/blender/mbb/advtrains_engine_japan.xcf b/assets/blender/mbb/advtrains_engine_japan.xcf
new file mode 100644
index 0000000..ec28071
--- /dev/null
+++ b/assets/blender/mbb/advtrains_engine_japan.xcf
diff --git a/assets/blender/mbb/advtrains_wagon_japan.xcf b/assets/blender/mbb/advtrains_wagon_japan.xcf
deleted file mode 100644
index 4fc88c0..0000000
--- a/assets/blender/mbb/advtrains_wagon_japan.xcf
+++ /dev/null
diff --git a/assets/blender/mbb/jpn_engine_anim_uv.png b/assets/blender/mbb/jpn_engine_anim_uv.png
new file mode 100644
index 0000000..d3fa419
--- /dev/null
+++ b/assets/blender/mbb/jpn_engine_anim_uv.png
diff --git a/assets/blender/mbb/jpn_wagon_anim_uv.png b/assets/blender/mbb/jpn_wagon_anim_uv.png
new file mode 100644
index 0000000..9d7ad56
--- /dev/null
+++ b/assets/blender/mbb/jpn_wagon_anim_uv.png
diff --git a/assets/blender/mbb/modern_japanlocomotive_anim.blend b/assets/blender/mbb/modern_japanlocomotive_anim.blend
new file mode 100644
index 0000000..fdfbc63
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_anim.blend
diff --git a/assets/blender/mbb/modern_japanlocomotive_anim.blend1 b/assets/blender/mbb/modern_japanlocomotive_anim.blend1
new file mode 100644
index 0000000..1409d63
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_anim.blend1
diff --git a/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend b/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend
new file mode 100644
index 0000000..ef85a10
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend
diff --git a/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend1 b/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend1
new file mode 100644
index 0000000..daae4be
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend1
diff --git a/assets/blender/mbb/modern_japanlocomotive_windows.blend b/assets/blender/mbb/modern_japanlocomotive_windows.blend
new file mode 100644
index 0000000..4987119
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_windows.blend
diff --git a/assets/blender/mbb/modern_japanlocomotive_windows.blend1 b/assets/blender/mbb/modern_japanlocomotive_windows.blend1
new file mode 100644
index 0000000..947eb77
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_windows.blend1
diff --git a/assets/blender/mbb/modern_japanlocomotive_windows_join.blend b/assets/blender/mbb/modern_japanlocomotive_windows_join.blend
new file mode 100644
index 0000000..ac798f1
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_windows_join.blend
diff --git a/assets/blender/mbb/modern_japanlocomotive_windows_join.blend1 b/assets/blender/mbb/modern_japanlocomotive_windows_join.blend1
new file mode 100644
index 0000000..68f1790
--- /dev/null
+++ b/assets/blender/mbb/modern_japanlocomotive_windows_join.blend1
diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend
index b05b0a5..1e7bf0b 100644
--- a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend
+++ b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend
diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1
index 145137b..b05b0a5 100644
--- a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1
+++ b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1
diff --git a/assets/modern_japan_lockomotive.blend b/assets/modern_japan_lockomotive.blend
new file mode 100644
index 0000000..344b1a3
--- /dev/null
+++ b/assets/modern_japan_lockomotive.blend
diff --git a/assets/modern_japan_lockomotive.blend1 b/assets/modern_japan_lockomotive.blend1
new file mode 100644
index 0000000..0350f4c
--- /dev/null
+++ b/assets/modern_japan_lockomotive.blend1
diff --git a/assets/modern_japan_wagon.blend b/assets/modern_japan_wagon.blend
new file mode 100644
index 0000000..f13a6f7
--- /dev/null
+++ b/assets/modern_japan_wagon.blend