From da323f447e276c4359c5c0b44c072a3df7a23668 Mon Sep 17 00:00:00 2001 From: rbduck Date: Sat, 5 Dec 2020 14:28:00 +0100 Subject: scale fixing: almost done... --- .../legacy/moretrains_japan_bullet_train.blend | Bin 0 -> 955396 bytes .../blend/moretrains_japan_bullet_engine.blend | Bin 792544 -> 796544 bytes .../blend/moretrains_japan_bullet_train.blend | Bin 955396 -> 0 bytes .../blend/moretrains_japan_bullet_wagon.blend | Bin 830584 -> 840392 bytes moretrains_japan/init.lua | 4 ++-- .../models/moretrains_japan_bullet_engine.b3d | Bin 163226 -> 163226 bytes .../models/moretrains_japan_bullet_wagon.b3d | Bin 249687 -> 249687 bytes .../blend/moretrains_draisine_anim.blend | Bin 736836 -> 745308 bytes moretrains_vintage/init.lua | 2 +- moretrains_vintage/models/moretrains_draisine.b3d | Bin 64169 -> 64169 bytes 10 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 moretrains_japan/blend/legacy/moretrains_japan_bullet_train.blend delete mode 100644 moretrains_japan/blend/moretrains_japan_bullet_train.blend diff --git a/moretrains_japan/blend/legacy/moretrains_japan_bullet_train.blend b/moretrains_japan/blend/legacy/moretrains_japan_bullet_train.blend new file mode 100644 index 0000000..a91142e Binary files /dev/null and b/moretrains_japan/blend/legacy/moretrains_japan_bullet_train.blend differ diff --git a/moretrains_japan/blend/moretrains_japan_bullet_engine.blend b/moretrains_japan/blend/moretrains_japan_bullet_engine.blend index cfb4888..19049f1 100644 Binary files a/moretrains_japan/blend/moretrains_japan_bullet_engine.blend and b/moretrains_japan/blend/moretrains_japan_bullet_engine.blend differ diff --git a/moretrains_japan/blend/moretrains_japan_bullet_train.blend b/moretrains_japan/blend/moretrains_japan_bullet_train.blend deleted file mode 100644 index a91142e..0000000 Binary files a/moretrains_japan/blend/moretrains_japan_bullet_train.blend and /dev/null differ diff --git a/moretrains_japan/blend/moretrains_japan_bullet_wagon.blend b/moretrains_japan/blend/moretrains_japan_bullet_wagon.blend index 9427cd4..e3ee2bd 100644 Binary files a/moretrains_japan/blend/moretrains_japan_bullet_wagon.blend and b/moretrains_japan/blend/moretrains_japan_bullet_wagon.blend differ diff --git a/moretrains_japan/init.lua b/moretrains_japan/init.lua index 70ec2e2..a661c63 100644 --- a/moretrains_japan/init.lua +++ b/moretrains_japan/init.lua @@ -68,7 +68,7 @@ advtrains.register_wagon("moretrains_engine_japan", { }, door_entry={-1.7}, visual_size = {x=1, y=1}, - wagon_span=3.18, + wagon_span=3.1, is_locomotive=true, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, drops={"default:steelblock"}, @@ -138,7 +138,7 @@ advtrains.register_wagon("moretrains_wagon_japan", { }, door_entry={-1.7, 1.7}, visual_size = {x=1, y=1}, - wagon_span=3.0, + wagon_span=2.96, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, drops={"default:steelblock"}, }, S("Japanese Train Wagon (moretrains)"), "moretrains_wagon_japan_inv.png") diff --git a/moretrains_japan/models/moretrains_japan_bullet_engine.b3d b/moretrains_japan/models/moretrains_japan_bullet_engine.b3d index ed7edc6..33f4ca3 100644 Binary files a/moretrains_japan/models/moretrains_japan_bullet_engine.b3d and b/moretrains_japan/models/moretrains_japan_bullet_engine.b3d differ diff --git a/moretrains_japan/models/moretrains_japan_bullet_wagon.b3d b/moretrains_japan/models/moretrains_japan_bullet_wagon.b3d index 4c64448..ea14c5d 100644 Binary files a/moretrains_japan/models/moretrains_japan_bullet_wagon.b3d and b/moretrains_japan/models/moretrains_japan_bullet_wagon.b3d differ diff --git a/moretrains_vintage/blend/moretrains_draisine_anim.blend b/moretrains_vintage/blend/moretrains_draisine_anim.blend index bb396cb..d43173b 100644 Binary files a/moretrains_vintage/blend/moretrains_draisine_anim.blend and b/moretrains_vintage/blend/moretrains_draisine_anim.blend differ diff --git a/moretrains_vintage/init.lua b/moretrains_vintage/init.lua index 881ba13..7f981f5 100644 --- a/moretrains_vintage/init.lua +++ b/moretrains_vintage/init.lua @@ -41,7 +41,7 @@ advtrains.register_wagon("moretrains_draisine", { }, assign_to_seat_group = {"dstand", "pass"}, visual_size = {x=1, y=1}, - wagon_span=1.06, + wagon_span=1.12, is_locomotive=true, collisionbox = {-0.8,-0.5,-0.7, 0.8,2,0.7}, custom_on_velocity_change=function(self, velocity) diff --git a/moretrains_vintage/models/moretrains_draisine.b3d b/moretrains_vintage/models/moretrains_draisine.b3d index 230c354..b2de474 100644 Binary files a/moretrains_vintage/models/moretrains_draisine.b3d and b/moretrains_vintage/models/moretrains_draisine.b3d differ -- cgit v1.2.3