aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororwell96 <mono96.mml@gmail.com>2017-01-17 20:02:25 +0100
committerorwell96 <mono96.mml@gmail.com>2017-01-17 20:02:25 +0100
commit9c400f7d435b4b1c303f1dd5ac31a8a52b263355 (patch)
tree72b4085cf0246b7339a8f83e3cc202790ef37ca3
parent33c3631ef5594b316254b308bcccdf46ef6df09f (diff)
downloadadvtrains-9c400f7d435b4b1c303f1dd5ac31a8a52b263355.tar.gz
advtrains-9c400f7d435b4b1c303f1dd5ac31a8a52b263355.tar.bz2
advtrains-9c400f7d435b4b1c303f1dd5ac31a8a52b263355.zip
Model, animate, texture and integrate new subway wagon
engine follows!
-rw-r--r--advtrains/advtrains_train_subway/init.lua10
-rw-r--r--advtrains/advtrains_train_subway/models/advtrains_subway_train.b3dbin95856 -> 0 bytes
-rw-r--r--advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3dbin0 -> 459309 bytes
-rw-r--r--advtrains/advtrains_train_subway/textures/advtrains_subway_train.pngbin12002 -> 0 bytes
-rw-r--r--advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.pngbin0 -> 3618 bytes
-rw-r--r--advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png (renamed from advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png)bin900 -> 900 bytes
-rw-r--r--assets/blender/subway-train.blendbin536268 -> 518888 bytes
-rw-r--r--assets/blender/subway-train.blend1bin538188 -> 536268 bytes
-rw-r--r--assets/blender/subway-train_animate.blendbin0 -> 568668 bytes
-rw-r--r--assets/blender/subway-train_animate.blend1bin0 -> 558980 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored.blendbin0 -> 798328 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored.blend1bin0 -> 863656 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored_solidify.blendbin0 -> 879916 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored_solidify.blend1bin0 -> 879884 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored_solidify_uv.blendbin0 -> 832204 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored_solidify_uv.blend1bin0 -> 832396 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored_solidify_uv.pngbin0 -> 177111 bytes
-rw-r--r--assets/blender/subway-train_animate_mirrored_solidify_uv.xcfbin0 -> 369791 bytes
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ