Added advtrains_granite, advtrains_train_jpntlr600, advtrains_train_jre231 and tfl_s7stock_modpack

advtrains_granite

@@ -0,0 +1 @@
+Subproject commit e9b415477c0da42bfd90db15797c7102d3b90612

advtrains_train_jpntlr600

@@ -0,0 +1 @@
+Subproject commit cb5c6d233a696500335dbeb1bb7bb69fc9174fb5

advtrains_train_jre231/depends.txt

@@ -0,0 +1,2 @@
+advtrains
+intllib?

advtrains_train_jre231/init.lua

@@ -0,0 +1,347 @@
+local S
+if minetest.get_modpath("intllib") then
+    S = intllib.Getter()
+else
+    S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end
+end
+
+local function jr_set_livery(self, puncher, itemstack,data)
+		-- Get color data
+	local meta = itemstack:get_meta()
+	local color = meta:get_string("paint_color")
+	local alpha = tonumber(meta:get_string("alpha"))
+	if color and color:find("^#%x%x%x%x%x%x$") then
+		data.livery = self.base_texture.."^("..self.base_livery.."^[colorize:"..color..":255)" -- livery texture has no own texture....
+		self:set_textures(data)
+	end
+end
+
+local function	jr_set_textures(self, data)
+	if data.livery then
+		self.object:set_properties({
+				textures={data.livery}
+		})
+	end
+end
+
+advtrains.register_wagon("KuHa_E231", {
+	mesh="advtrains_KuHa_E231.b3d",
+	textures = {"advtrains_KuHa_E231.png"},
+	drives_on={default=true},
+	max_speed=20,
+	seats = {
+		{
+			name=S("Driver stand"),
+			attach_offset={x=0, y=0, z=18},
+			view_offset={x=0, y=0, z=18},
+			driving_ctrl_access=true,
+			group="dstand",
+		},
+		{
+			name="1",
+			attach_offset={x=-4, y=0, z=0},
+			view_offset={x=-4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="2",
+			attach_offset={x=4, y=0, z=0},
+			view_offset={x=4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="3",
+			attach_offset={x=-4, y=0, z=-8},
+			view_offset={x=-4, y=0, z=-8},
+			group="pass",
+		},
+		{
+			name="4",
+			attach_offset={x=4, y=0, z=-8},
+			view_offset={x=4, y=0, z=-8},
+			group="pass",
+		},
+	},
+	seat_groups = {
+		dstand={
+			name = "Driver Stand",
+			access_to = {"pass"},
+			require_doors_open=true,
+			driving_ctrl_access=true,
+		},
+		pass={
+			name = "Passenger area",
+			access_to = {"dstand"},
+			require_doors_open=true,
+		},
+	},
+	assign_to_seat_group = {"dstand", "pass"},
+	doors={
+		open={
+			[-1]={frames={x=0, y=40}, time=1},
+			[1]={frames={x=80, y=120}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		},
+		close={
+			[-1]={frames={x=40, y=80}, time=1},
+			[1]={frames={x=120, y=160}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		}
+	},
+	door_entry={-1},
+	assign_to_seat_group = {"dstand", "pass"},
+	visual_size = {x=1, y=1},
+	wagon_span=2.5,
+	is_locomotive=true,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+	horn_sound = "advtrains_train_jre231_horn",
+	base_texture = "advtrains_KuHa_E231.png",
+	base_livery = "advtrains_KuHa_E231_livery.png",
+	set_textures = jr_set_textures,
+	set_livery = jr_set_livery,
+
+	custom_on_velocity_change = function(self, velocity, old_velocity, dtime)
+		if not velocity or not old_velocity then return end
+		if old_velocity == 0 and velocity > 0 then
+			if self.sound_arrive_handle then
+				minetest.sound_stop(self.sound_arrive_handle)
+				self.sound_arrive_handle = nil
+			end
+			self.sound_depart_handle = minetest.sound_play("advtrains_train_jre231_depart", {object = self.object})
+		end
+		if velocity < 2 and (old_velocity >= 2 or old_velocity == velocity) and not self.sound_arrive_handle then
+			if self.sound_depart_handle then
+				minetest.sound_stop(self.sound_depart_handle)
+				self.sound_depart_handle = nil
+			end
+			self.sound_arrive_handle = minetest.sound_play("advtrains_train_jre231_arrive", {object = self.object})
+		elseif (velocity > old_velocity) and self.sound_arrive_handle then
+			minetest.sound_stop(self.sound_arrive_handle)
+			self.sound_arrive_handle = nil
+		end
+	end,
+
+}, S("KuHa_E231"), "advtrains_KuHa_E231_inv.png^advtrains_jre231_inv_overlay_right.png^advtrains_jre231_inv_overlay_middle.png")
+
+advtrains.register_wagon("MoHa_E231", {
+	mesh="advtrains_MoHa_E231.b3d",
+	textures = {"advtrains_MoHa_E231.png"},
+	drives_on={default=true},
+	max_speed=20,
+	seats = {
+		{
+			name="1",
+			attach_offset={x=-4, y=0, z=8},
+			view_offset={x=-4, y=0, z=8},
+			group="pass",
+		},
+		{
+			name="2",
+			attach_offset={x=4, y=0, z=8},
+			view_offset={x=4, y=0, z=8},
+			group="pass",
+		},
+		{
+			name="1a",
+			attach_offset={x=-4, y=0, z=0},
+			view_offset={x=-4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="2a",
+			attach_offset={x=4, y=0, z=0},
+			view_offset={x=4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="3",
+			attach_offset={x=-4, y=0, z=-8},
+			view_offset={x=-4, y=0, z=-8},
+			group="pass",
+		},
+		{
+			name="4",
+			attach_offset={x=4, y=0, z=-8},
+			view_offset={x=4, y=0, z=-8},
+			group="pass",
+		},
+	},
+	seat_groups = {
+		pass={
+			name = "Passenger area",
+			access_to = {},
+			require_doors_open=true,
+		},
+	},
+	assign_to_seat_group = {"pass"},
+	doors={
+		open={
+			[-1]={frames={x=0, y=40}, time=1},
+			[1]={frames={x=80, y=120}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		},
+		close={
+			[-1]={frames={x=40, y=80}, time=1},
+			[1]={frames={x=120, y=160}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		}
+	},
+	door_entry={-1, 1},
+	visual_size = {x=1, y=1},
+	wagon_span=2.3,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	base_texture = "advtrains_MoHa_E231.png",
+	base_livery = "advtrains_MoHa_E231_livery.png",
+	set_textures = jr_set_textures,
+	set_livery = jr_set_livery,
+	drops={"default:steelblock 4"},
+}, S("MoHa_E231"), "advtrains_MoHa_E231_inv.png^advtrains_jre231_inv_overlay_middle.png^advtrains_jre231_inv_overlay_left.png^advtrains_jre231_inv_overlay_right.png^advtrains_jre231_inv_overlay_top.png")
+
+advtrains.register_wagon("SaHa_E231", {
+	mesh="advtrains_SaHa_E231.b3d",
+	textures = {"advtrains_SaHa_E231.png"},
+	drives_on={default=true},
+	max_speed=20,
+	seats = {
+		{
+			name="1",
+			attach_offset={x=-4, y=0, z=8},
+			view_offset={x=-4, y=0, z=8},
+			group="pass",
+		},
+		{
+			name="2",
+			attach_offset={x=4, y=0, z=8},
+			view_offset={x=4, y=0, z=8},
+			group="pass",
+		},
+		{
+			name="1a",
+			attach_offset={x=-4, y=0, z=0},
+			view_offset={x=-4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="2a",
+			attach_offset={x=4, y=0, z=0},
+			view_offset={x=4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="3",
+			attach_offset={x=-4, y=0, z=-8},
+			view_offset={x=-4, y=0, z=-8},
+			group="pass",
+		},
+		{
+			name="4",
+			attach_offset={x=4, y=0, z=-8},
+			view_offset={x=4, y=0, z=-8},
+			group="pass",
+		},
+	},
+	seat_groups = {
+		pass={
+			name = "Passenger area",
+			access_to = {},
+			require_doors_open=true,
+		},
+	},
+	assign_to_seat_group = {"pass"},
+	doors={
+		open={
+			[-1]={frames={x=0, y=40}, time=1},
+			[1]={frames={x=80, y=120}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		},
+		close={
+			[-1]={frames={x=40, y=80}, time=1},
+			[1]={frames={x=120, y=160}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		}
+	},
+	door_entry={-1, 1},
+	visual_size = {x=1, y=1},
+	wagon_span=2.3,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+	base_texture = "advtrains_SaHa_E231.png",
+	base_livery = "advtrains_MoHa_E231_livery.png",
+	set_textures = jr_set_textures,
+	set_livery = jr_set_livery,
+}, S("SaHa_E231"), "advtrains_SaHa_E231_inv.png^advtrains_jre231_inv_overlay_left.png^advtrains_jre231_inv_overlay_right.png")
+
+advtrains.register_wagon("MoHa_E230", {
+	mesh="advtrains_MoHa_E230.b3d",
+	textures = {"advtrains_MoHa_E230.png"},
+	drives_on={default=true},
+	max_speed=20,
+	seats = {
+		{
+			name="1",
+			attach_offset={x=-4, y=0, z=8},
+			view_offset={x=-4, y=0, z=8},
+			group="pass",
+		},
+		{
+			name="2",
+			attach_offset={x=4, y=0, z=8},
+			view_offset={x=4, y=0, z=8},
+			group="pass",
+		},
+		{
+			name="1a",
+			attach_offset={x=-4, y=0, z=0},
+			view_offset={x=-4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="2a",
+			attach_offset={x=4, y=0, z=0},
+			view_offset={x=4, y=0, z=0},
+			group="pass",
+		},
+		{
+			name="3",
+			attach_offset={x=-4, y=0, z=-8},
+			view_offset={x=-4, y=0, z=-8},
+			group="pass",
+		},
+		{
+			name="4",
+			attach_offset={x=4, y=0, z=-8},
+			view_offset={x=4, y=0, z=-8},
+			group="pass",
+		},
+	},
+	seat_groups = {
+		pass={
+			name = "Passenger area",
+			access_to = {},
+			require_doors_open=true,
+		},
+	},
+	assign_to_seat_group = {"pass"},
+	doors={
+		open={
+			[-1]={frames={x=0, y=40}, time=1},
+			[1]={frames={x=80, y=120}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		},
+		close={
+			[-1]={frames={x=40, y=80}, time=1},
+			[1]={frames={x=120, y=160}, time=1},
+			sound = "advtrains_train_jre231_door_chime",
+		}
+	},
+	door_entry={-1, 1},
+	visual_size = {x=1, y=1},
+	wagon_span=2.3,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	base_texture = "advtrains_MoHa_E230.png",
+	base_livery = "advtrains_MoHa_E231_livery.png",
+	set_textures = jr_set_textures,
+	set_livery = jr_set_livery,
+	drops={"default:steelblock 4"},
+}, S("MoHa_E230"), "advtrains_MoHa_E230_inv.png^advtrains_jre231_inv_overlay_middle.png^advtrains_jre231_inv_overlay_left.png^advtrains_jre231_inv_overlay_right.png")

advtrains_train_jre231/locale/de.txt

@@ -0,0 +1,4 @@
+Driver Stand = Führerstand
+Japanese Train Engine = Japanische Personenzug-Lokomotive
+Default Seat = Standardsitzplatz
+Japanese Train Wagon = Japanischer Personenzug-Passagierwaggon

advtrains_train_jre231/readme.txt

@@ -0,0 +1,36 @@
+## JR E231series modpack for ADVTRAINS ##
+by Mainote plants lab
+
+https://mainotech.jimdo.com/
+
+
+
+This is add-on modpack for ADVTRAINS Mod.
+How to install this add-on: See ADVTRAINS Mod manual 
+
+License of code: LGPL 2.1
+License of media: CC-BY-SA 3.0
+
+Using this modpack is at your own risk.
+
+
+
+These Works are using advtrainslib and idea.
+
+
+
+## ADVTRAINS ##
+by orwell96 and contributors
+
+License of code: LGPL 2.1
+License of media: CC-BY-SA 3.0
+
+
+
+このModpackは、ADVTRAINS Modのアドオンパックです。
+詳細な利用方法はADVTRAINS Modのマニュアルをご参照ください。
+
+このModpackにて生じたいかなる損害も、製作者は一切の責任を有しません。
+
+このModpackはadvtrainlibおよびこれらの技術の恩恵を受けています。
+よって、ADVTRAINS Modの開発者名とそのライセンスを明記・継承いたします。

tfl_s7stock_modpack

@@ -0,0 +1 @@
+Subproject commit 4bc09e2f29036d38114986f29268467ef988479f