aboutsummaryrefslogtreecommitdiff
path: root/advtrains/advtrains_train_steam
diff options
context:
space:
mode:
authorMBB <mbb-mail@gmx.de>2017-08-24 19:26:40 +0200
committerorwell96 <mono96.mml@gmail.com>2017-08-24 19:26:40 +0200
commitb75c83ea43bb9f6e3bee2b4db955e2a9e7be885e (patch)
tree0f62306404ff143d73c69740d27839da6cc12c5d /advtrains/advtrains_train_steam
parent6ddf3fed14ec98b1a318c88e32be62f802eb5a74 (diff)
downloadadvtrains-b75c83ea43bb9f6e3bee2b4db955e2a9e7be885e.tar.gz
advtrains-b75c83ea43bb9f6e3bee2b4db955e2a9e7be885e.tar.bz2
advtrains-b75c83ea43bb9f6e3bee2b4db955e2a9e7be885e.zip
Merge PR from mbb - Improve models and textures
Diffstat (limited to 'advtrains/advtrains_train_steam')
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/depends.txt0
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/init.lua19
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/locale/de.txt0
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3dbin468002 -> 468002 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3dbin437126 -> 437126 bytes
-rw-r--r--advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3dbin341965 -> 145287 bytes
-rwxr-xr-xadvtrains/advtrains_train_steam/models/advtrains_wagon_box.b3dbin0 -> 50385 bytes
-rw-r--r--advtrains/advtrains_train_steam/screenshot.pngbin0 -> 809738 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.pngbin462 -> 462 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.pngbin61988 -> 61988 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_engine_steam.pngbin31915 -> 31915 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.pngbin469 -> 469 bytes
-rw-r--r--advtrains/advtrains_train_steam/textures/advtrains_wagon.pngbin42023 -> 17701 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_wagon_box.pngbin22503 -> 15197 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.pngbin347 -> 347 bytes
-rwxr-xr-x[-rw-r--r--]advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.pngbin709 -> 699 bytes
16 files changed, 11 insertions, 8 deletions
diff --git a/advtrains/advtrains_train_steam/depends.txt b/advtrains/advtrains_train_steam/depends.txt
index 1fb6665..1fb6665 100644..100755
--- a/advtrains/advtrains_train_steam/depends.txt
+++ b/advtrains/advtrains_train_steam/depends.txt
diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua
index 4403f6c..315104a 100644..100755
--- 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
index ac06e20..ac06e20 100644..100755
--- a/advtrains/advtrains_train_steam/locale/de.txt
+++ b/advtrains/advtrains_train_steam/locale/de.txt
diff --git a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
index 7418d8a..7418d8a 100644..100755
--- a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
+++ b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
Binary files differ
diff --git a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d
index 6a92f57..6a92f57 100644..100755
--- a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d
+++ b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d
Binary files differ
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
--- a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d
+++ b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d
Binary files 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
--- /dev/null
+++ b/advtrains/advtrains_train_steam/models/advtrains_wagon_box.b3d
Binary files differ
diff --git a/advtrains/advtrains_train_steam/screenshot.png b/advtrains/advtrains_train_steam/screenshot.png
new file mode 100644
index 0000000..089da73
--- /dev/null
+++ b/advtrains/advtrains_train_steam/screenshot.png
Binary files 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
index 51adb5a..51adb5a 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png
Binary files differ
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
index eab4dc8..eab4dc8 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
Binary files differ
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png
index 4b27e77..4b27e77 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png
Binary files differ
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png
index 8d3fafb..8d3fafb 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png
Binary files differ
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png
index c850518..bd34e68 100644
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png
Binary files differ
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png
index 8bfbe06..8cdd440 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png
Binary files 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
index 480f245..480f245 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
Binary files differ
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png
index 0b72ac3..65f7984 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png
+++ b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png
Binary files differ