From a2d0b1b8f2f6ba2864e1dbbfc2457583114152ea Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 24 Jan 2017 19:09:33 +0100 Subject: Create new models and textures for japanese train --- advtrains/advtrains_train_japan/init.lua | 24 +++++++++++++++++++-- .../models/advtrains_engine_japan.b3d | Bin 165287 -> 437635 bytes .../models/advtrains_wagon_japan.b3d | Bin 171991 -> 554284 bytes .../textures/advtrains_engine_japan.png | Bin 12664 -> 27935 bytes .../textures/advtrains_wagon_japan.png | Bin 11175 -> 54396 bytes advtrains/advtrains_train_subway/init.lua | 8 +++---- .../models/advtrains_subway_wagon.b3d | Bin 459309 -> 460013 bytes assets/blender/mbb/advtrains_engine_japan.xcf | Bin 0 -> 2621842 bytes assets/blender/mbb/advtrains_wagon_japan.xcf | Bin 814467 -> 0 bytes assets/blender/mbb/jpn_engine_anim_uv.png | Bin 0 -> 274484 bytes assets/blender/mbb/jpn_wagon_anim_uv.png | Bin 0 -> 206208 bytes .../blender/mbb/modern_japanlocomotive_anim.blend | Bin 0 -> 1149060 bytes .../blender/mbb/modern_japanlocomotive_anim.blend1 | Bin 0 -> 1170088 bytes .../mbb/modern_japanlocomotive_anim_uv.blend | Bin 0 -> 1146996 bytes .../mbb/modern_japanlocomotive_anim_uv.blend1 | Bin 0 -> 1144108 bytes .../mbb/modern_japanlocomotive_windows.blend | Bin 0 -> 790808 bytes .../mbb/modern_japanlocomotive_windows.blend1 | Bin 0 -> 790808 bytes .../mbb/modern_japanlocomotive_windows_join.blend | Bin 0 -> 762448 bytes .../mbb/modern_japanlocomotive_windows_join.blend1 | Bin 0 -> 767528 bytes ...subway-train_animate_mirrored_solidify_uv.blend | Bin 832204 -> 836620 bytes ...ubway-train_animate_mirrored_solidify_uv.blend1 | Bin 832396 -> 832204 bytes assets/modern_japan_lockomotive.blend | Bin 0 -> 892480 bytes assets/modern_japan_lockomotive.blend1 | Bin 0 -> 885888 bytes assets/modern_japan_wagon.blend | Bin 0 -> 856968 bytes 24 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 assets/blender/mbb/advtrains_engine_japan.xcf delete mode 100644 assets/blender/mbb/advtrains_wagon_japan.xcf create mode 100644 assets/blender/mbb/jpn_engine_anim_uv.png create mode 100644 assets/blender/mbb/jpn_wagon_anim_uv.png create mode 100644 assets/blender/mbb/modern_japanlocomotive_anim.blend create mode 100644 assets/blender/mbb/modern_japanlocomotive_anim.blend1 create mode 100644 assets/blender/mbb/modern_japanlocomotive_anim_uv.blend create mode 100644 assets/blender/mbb/modern_japanlocomotive_anim_uv.blend1 create mode 100644 assets/blender/mbb/modern_japanlocomotive_windows.blend create mode 100644 assets/blender/mbb/modern_japanlocomotive_windows.blend1 create mode 100644 assets/blender/mbb/modern_japanlocomotive_windows_join.blend create mode 100644 assets/blender/mbb/modern_japanlocomotive_windows_join.blend1 create mode 100644 assets/modern_japan_lockomotive.blend create mode 100644 assets/modern_japan_lockomotive.blend1 create mode 100644 assets/modern_japan_wagon.blend 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 Binary files a/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d and b/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d differ 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 Binary files a/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d and b/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d differ 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 Binary files a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png and b/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png differ 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 Binary files a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png and b/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png differ 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 Binary files a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d and b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d differ 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 Binary files /dev/null and b/assets/blender/mbb/advtrains_engine_japan.xcf differ 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 Binary files a/assets/blender/mbb/advtrains_wagon_japan.xcf and /dev/null differ 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 Binary files /dev/null and b/assets/blender/mbb/jpn_engine_anim_uv.png differ 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 Binary files /dev/null and b/assets/blender/mbb/jpn_wagon_anim_uv.png differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_anim.blend differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_anim.blend1 differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_anim_uv.blend1 differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_windows.blend differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_windows.blend1 differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_windows_join.blend differ 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 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive_windows_join.blend1 differ 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 Binary files a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend and b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend differ 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 Binary files a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 and b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 differ diff --git a/assets/modern_japan_lockomotive.blend b/assets/modern_japan_lockomotive.blend new file mode 100644 index 0000000..344b1a3 Binary files /dev/null and b/assets/modern_japan_lockomotive.blend differ diff --git a/assets/modern_japan_lockomotive.blend1 b/assets/modern_japan_lockomotive.blend1 new file mode 100644 index 0000000..0350f4c Binary files /dev/null and b/assets/modern_japan_lockomotive.blend1 differ diff --git a/assets/modern_japan_wagon.blend b/assets/modern_japan_wagon.blend new file mode 100644 index 0000000..f13a6f7 Binary files /dev/null and b/assets/modern_japan_wagon.blend differ -- cgit v1.2.3