Model, animate, texture and integrate new subway wagon

engine follows!

18 files changed, 7 insertions, 3 deletions

diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua
index b5bdb18..c68395c 100644
--- a/advtrains/advtrains_train_subway/init.lua
+++ b/advtrains/advtrains_train_subway/init.lua
@@ -1,7 +1,7 @@
 
 advtrains.register_wagon("subway_wagon", {
-	mesh="advtrains_subway_train.b3d",
-	textures = {"advtrains_subway_train.png"},
+	mesh="advtrains_subway_wagon.b3d",
+	textures = {"advtrains_subway_wagon.png"},
 	drives_on={default=true},
 	max_speed=15,
 	seats = {
@@ -17,7 +17,11 @@ advtrains.register_wagon("subway_wagon", {
 	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
 	is_locomotive=true,
 	drops={"default:steelblock 4"},
-}, "Subway Passenger Wagon", "advtrains_subway_train_inv.png")
+	--custom_on_activate = function(self, dtime_s)
+	--	atprint("subway custom_on_activate")
+	--	self.object:set_animation({x=1,y=80}, 15, 0, true)
+	--end,
+}, "Subway Passenger Wagon", "advtrains_subway_wagon_inv.png")
 
 --wagons
 minetest.register_craft({
diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d
deleted file mode 100644
index a824d33..0000000
--- a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d
+++ /dev/null
diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d
new file mode 100644
index 0000000..8f35769
--- /dev/null
+++ b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d
diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png
deleted file mode 100644
index 1d569f3..0000000
--- a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png
+++ /dev/null
diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png
new file mode 100644
index 0000000..079d797
--- /dev/null
+++ b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png
diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
index 1d0e809..1d0e809 100644
--- a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png
+++ b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
diff --git a/assets/blender/subway-train.blend b/assets/blender/subway-train.blend
index 690d87b..01bb233 100644
--- a/assets/blender/subway-train.blend
+++ b/assets/blender/subway-train.blend
diff --git a/assets/blender/subway-train.blend1 b/assets/blender/subway-train.blend1
index 86d1f92..690d87b 100644
--- a/assets/blender/subway-train.blend1
+++ b/assets/blender/subway-train.blend1
diff --git a/assets/blender/subway-train_animate.blend b/assets/blender/subway-train_animate.blend
new file mode 100644
index 0000000..75cdc52
--- /dev/null
+++ b/assets/blender/subway-train_animate.blend
diff --git a/assets/blender/subway-train_animate.blend1 b/assets/blender/subway-train_animate.blend1
new file mode 100644
index 0000000..04171fc
--- /dev/null
+++ b/assets/blender/subway-train_animate.blend1
diff --git a/assets/blender/subway-train_animate_mirrored.blend b/assets/blender/subway-train_animate_mirrored.blend
new file mode 100644
index 0000000..aa11c34
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored.blend
diff --git a/assets/blender/subway-train_animate_mirrored.blend1 b/assets/blender/subway-train_animate_mirrored.blend1
new file mode 100644
index 0000000..4d64915
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored.blend1
diff --git a/assets/blender/subway-train_animate_mirrored_solidify.blend b/assets/blender/subway-train_animate_mirrored_solidify.blend
new file mode 100644
index 0000000..7a25b6f
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored_solidify.blend
diff --git a/assets/blender/subway-train_animate_mirrored_solidify.blend1 b/assets/blender/subway-train_animate_mirrored_solidify.blend1
new file mode 100644
index 0000000..f81e303
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored_solidify.blend1
diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend
new file mode 100644
index 0000000..b05b0a5
--- /dev/null
+++ 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
new file mode 100644
index 0000000..145137b
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1
diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.png b/assets/blender/subway-train_animate_mirrored_solidify_uv.png
new file mode 100644
index 0000000..e63a7f2
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored_solidify_uv.png
diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf b/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf
new file mode 100644
index 0000000..42adace
--- /dev/null
+++ b/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf