From b75c83ea43bb9f6e3bee2b4db955e2a9e7be885e Mon Sep 17 00:00:00 2001 From: MBB Date: Thu, 24 Aug 2017 19:26:40 +0200 Subject: Merge PR from mbb - Improve models and textures --- advtrains/advtrains_train_steam/depends.txt | 0 advtrains/advtrains_train_steam/init.lua | 19 +++++++++++-------- advtrains/advtrains_train_steam/locale/de.txt | 0 .../models/advtrains_detailed_steam_engine.b3d | Bin .../models/advtrains_engine_steam.b3d | Bin .../models/advtrains_passenger_wagon.b3d | Bin 341965 -> 145287 bytes .../models/advtrains_wagon_box.b3d | Bin 0 -> 50385 bytes advtrains/advtrains_train_steam/screenshot.png | Bin 0 -> 809738 bytes .../advtrains_detailed_engine_steam_inv.png | Bin .../textures/advtrains_detailed_steam_engine.png | Bin .../textures/advtrains_engine_steam.png | Bin .../textures/advtrains_engine_steam_inv.png | Bin .../textures/advtrains_wagon.png | Bin 42023 -> 17701 bytes .../textures/advtrains_wagon_box.png | Bin 22503 -> 15197 bytes .../textures/advtrains_wagon_box_inv.png | Bin .../textures/advtrains_wagon_inv.png | Bin 709 -> 699 bytes 16 files changed, 11 insertions(+), 8 deletions(-) mode change 100644 => 100755 advtrains/advtrains_train_steam/depends.txt mode change 100644 => 100755 advtrains/advtrains_train_steam/init.lua mode change 100644 => 100755 advtrains/advtrains_train_steam/locale/de.txt mode change 100644 => 100755 advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d mode change 100644 => 100755 advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d create mode 100755 advtrains/advtrains_train_steam/models/advtrains_wagon_box.b3d create mode 100644 advtrains/advtrains_train_steam/screenshot.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png mode change 100644 => 100755 advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png (limited to 'advtrains/advtrains_train_steam') diff --git a/advtrains/advtrains_train_steam/depends.txt b/advtrains/advtrains_train_steam/depends.txt old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua old mode 100644 new mode 100755 index 4403f6c..315104a --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -35,7 +35,7 @@ advtrains.register_wagon("newlocomotive", { }, assign_to_seat_group = {"dstand"}, visual_size = {x=1, y=1}, - wagon_span=1.85, + wagon_span=2.3, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, update_animation=function(self, velocity) if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then @@ -149,14 +149,14 @@ advtrains.register_wagon("wagon_default", { seats = { { name="1", - attach_offset={x=-4, y=8, z=8}, - view_offset={x=0, y=0, z=0}, + attach_offset={x=2, y=6, z=8}, + view_offset={x=0, y=-4, z=0}, group="pass", }, { name="2", - attach_offset={x=4, y=8, z=8}, - view_offset={x=0, y=0, z=0}, + attach_offset={x=-1, y=6, z=8}, + view_offset={x=0, y=-4, z=0}, group="pass", }, { @@ -178,20 +178,23 @@ advtrains.register_wagon("wagon_default", { access_to = {}, }, }, + assign_to_seat_group = {"pass"}, visual_size = {x=1, y=1}, - wagon_span=3.1, + wagon_span=2.634, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, drops={"default:steelblock 4"}, }, S("Passenger Wagon"), "advtrains_wagon_inv.png") + + advtrains.register_wagon("wagon_box", { - mesh="advtrains_wagon.b3d", + mesh="advtrains_wagon_box.b3d", textures = {"advtrains_wagon_box.png"}, drives_on={default=true}, max_speed=10, seats = {}, visual_size = {x=1, y=1}, - wagon_span=1.8, + wagon_span=2, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, drops={"default:steelblock 4"}, has_inventory = true, diff --git a/advtrains/advtrains_train_steam/locale/de.txt b/advtrains/advtrains_train_steam/locale/de.txt old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d index bb057f8..2bc01b2 100644 Binary files a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d and b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d differ diff --git a/advtrains/advtrains_train_steam/models/advtrains_wagon_box.b3d b/advtrains/advtrains_train_steam/models/advtrains_wagon_box.b3d new file mode 100755 index 0000000..914975f Binary files /dev/null and b/advtrains/advtrains_train_steam/models/advtrains_wagon_box.b3d differ diff --git a/advtrains/advtrains_train_steam/screenshot.png b/advtrains/advtrains_train_steam/screenshot.png new file mode 100644 index 0000000..089da73 Binary files /dev/null and b/advtrains/advtrains_train_steam/screenshot.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png index c850518..bd34e68 100644 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png and b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png old mode 100644 new mode 100755 index 8bfbe06..8cdd440 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png and b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png old mode 100644 new mode 100755 diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png old mode 100644 new mode 100755 index 0b72ac3..65f7984 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png and b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png differ -- cgit v1.2.3