Merge branch 'patch-1' into 'master'
Изменена максимальная скорость, изменен регистр в именах файлов Изменена максимальная скорость, изменен регистр в именах файлов See merge request !1
This commit is contained in:
Alex
commit
8e63b2833c
|
|
@ -1,268 +1,268 @@
|
|||
function data()
|
||||
return {
|
||||
boundingInfo = {
|
||||
bbMax = {
|
||||
6.97773, 1.525999, 4.51783,
|
||||
},
|
||||
bbMin = {
|
||||
-6.97773, -1.52599, -0.0383499,
|
||||
},
|
||||
|
||||
},
|
||||
collider = {
|
||||
params = {
|
||||
|
||||
},
|
||||
type = "MESH",
|
||||
|
||||
},
|
||||
lods = {
|
||||
{
|
||||
animations = {
|
||||
|
||||
},
|
||||
children = {
|
||||
{
|
||||
id = "vehicle/train/F.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_bogie1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_bogie2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},
|
||||
},
|
||||
events = {
|
||||
drive = {
|
||||
[2] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
[3] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
matConfigs = {
|
||||
{
|
||||
0, 0, 0
|
||||
},
|
||||
},
|
||||
static = false,
|
||||
visibleFrom = 0,
|
||||
visibleTo = 200,
|
||||
},{
|
||||
animations = {
|
||||
|
||||
},
|
||||
children = {
|
||||
{
|
||||
id = "vehicle/train/F_LOD1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_bogie1_LOD1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_bogie2_LOD1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},
|
||||
},
|
||||
events = {
|
||||
drive = {
|
||||
[2] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
[3] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
matConfigs = {
|
||||
{
|
||||
0, 0, 0
|
||||
},
|
||||
},
|
||||
static = false,
|
||||
visibleFrom = 200,
|
||||
visibleTo = 600,
|
||||
},{
|
||||
animations = {
|
||||
|
||||
},
|
||||
children = {
|
||||
{
|
||||
id = "vehicle/train/F_LOD2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_bogie1_LOD2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_bogie2_LOD2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},
|
||||
},
|
||||
events = {
|
||||
drive = {
|
||||
[2] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
[3] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
matConfigs = {
|
||||
{
|
||||
0, 0, 0
|
||||
},
|
||||
},
|
||||
static = false,
|
||||
visibleFrom = 600,
|
||||
visibleTo = 2500,
|
||||
},
|
||||
},
|
||||
metadata = {
|
||||
description = {
|
||||
name = _("ф"),
|
||||
description = _(
|
||||
"Танковые паровозы типа 0-3-0—0-3-0 серии Ф Коломенского завода\n"..
|
||||
"долгое время служили на тяжелом участке Закавказской (Поти-Тифлисской)\n"..
|
||||
"железной дороги — Сурамском перевале. Паровозы водили как товарные, так и пассажирские поезда." )
|
||||
},
|
||||
railVehicle = {
|
||||
topSpeed = 37.0,
|
||||
weight = 90.2,
|
||||
engines = {
|
||||
{ type = "STEAM", power = 309.0, tractiveEffort = 120.0 }
|
||||
},
|
||||
configs = {
|
||||
{
|
||||
axles = {
|
||||
},
|
||||
fakeBogies = {
|
||||
{group = 1, position = 3.5671, offset = 0},
|
||||
{group = 1, position = -3.5671, offset = 0},
|
||||
{group = 3, position = 3.5671, offset = 0},
|
||||
{group = 11, position = -3.5671, offset = 0},
|
||||
},
|
||||
},
|
||||
},
|
||||
soundSet = { name = "train_steam_old", horn = "vehicle/train_steam_old/steam_horn_12.wav" }
|
||||
},
|
||||
transportVehicle = {
|
||||
carrier = "RAIL"
|
||||
},
|
||||
availability = {
|
||||
yearFrom = 1884,
|
||||
yearTo = 1894
|
||||
},
|
||||
cost = {
|
||||
price = 500000
|
||||
},
|
||||
maintenance = {
|
||||
runningCosts = 300000,
|
||||
lifespan = 50
|
||||
},
|
||||
particleSystem = {
|
||||
emitters = {
|
||||
{
|
||||
position = { -5.1704, .0, 4.6238 },
|
||||
velocity = { .0, .0, 10.0 },
|
||||
color = { .3, .3, .3 },
|
||||
frequency = 100,
|
||||
lifeTime = 15.0,
|
||||
size01 = { 1, 12.0 },
|
||||
child = 1
|
||||
},{
|
||||
position = { 5.1704, .0, 4.6238 },
|
||||
velocity = { .0, .0, 10.0 },
|
||||
color = { .3, .3, .3 },
|
||||
frequency = 100,
|
||||
lifeTime = 15.0,
|
||||
size01 = { 1, 12.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { -5.8583, 1.008, .2671 },
|
||||
velocity = { .0, 4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { -5.8583, -1.008, .2671 },
|
||||
velocity = { .0, -4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { 5.8583, 1.008, .2671 },
|
||||
velocity = { .0, 4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { 5.8583, -1.008, .2671 },
|
||||
velocity = { .0, -4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
end
|
||||
|
||||
function data()
|
||||
return {
|
||||
boundingInfo = {
|
||||
bbMax = {
|
||||
6.97773, 1.525999, 4.51783,
|
||||
},
|
||||
bbMin = {
|
||||
-6.97773, -1.52599, -0.0383499,
|
||||
},
|
||||
|
||||
},
|
||||
collider = {
|
||||
params = {
|
||||
|
||||
},
|
||||
type = "MESH",
|
||||
|
||||
},
|
||||
lods = {
|
||||
{
|
||||
animations = {
|
||||
|
||||
},
|
||||
children = {
|
||||
{
|
||||
id = "vehicle/train/F.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_Bogie1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_Bogie2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},
|
||||
},
|
||||
events = {
|
||||
drive = {
|
||||
[2] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
[3] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
matConfigs = {
|
||||
{
|
||||
0, 0, 0
|
||||
},
|
||||
},
|
||||
static = false,
|
||||
visibleFrom = 0,
|
||||
visibleTo = 200,
|
||||
},{
|
||||
animations = {
|
||||
|
||||
},
|
||||
children = {
|
||||
{
|
||||
id = "vehicle/train/F_LOD1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_Bogie1_LOD1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_Bogie2_LOD1.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},
|
||||
},
|
||||
events = {
|
||||
drive = {
|
||||
[2] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
[3] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
matConfigs = {
|
||||
{
|
||||
0, 0, 0
|
||||
},
|
||||
},
|
||||
static = false,
|
||||
visibleFrom = 200,
|
||||
visibleTo = 600,
|
||||
},{
|
||||
animations = {
|
||||
|
||||
},
|
||||
children = {
|
||||
{
|
||||
id = "vehicle/train/F_LOD2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_Bogie1_LOD2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},{
|
||||
id = "vehicle/train/F_Bogie2_LOD2.grp",
|
||||
transf = {
|
||||
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3.5671, 0, 0, 1,
|
||||
},
|
||||
type = "GROUP",
|
||||
},
|
||||
},
|
||||
events = {
|
||||
drive = {
|
||||
[2] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
[3] = {
|
||||
forward = true,
|
||||
name = "drive",
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
},
|
||||
matConfigs = {
|
||||
{
|
||||
0, 0, 0
|
||||
},
|
||||
},
|
||||
static = false,
|
||||
visibleFrom = 600,
|
||||
visibleTo = 2500,
|
||||
},
|
||||
},
|
||||
metadata = {
|
||||
description = {
|
||||
name = _("ф"),
|
||||
description = _(
|
||||
"Танковые паровозы типа 0-3-0—0-3-0 серии Ф Коломенского завода\n"..
|
||||
"долгое время служили на тяжелом участке Закавказской (Поти-Тифлисской)\n"..
|
||||
"железной дороги — Сурамском перевале. Паровозы водили как товарные, так и пассажирские поезда." )
|
||||
},
|
||||
railVehicle = {
|
||||
topSpeed = 45.0,
|
||||
weight = 90.2,
|
||||
engines = {
|
||||
{ type = "STEAM", power = 309.0, tractiveEffort = 120.0 }
|
||||
},
|
||||
configs = {
|
||||
{
|
||||
axles = {
|
||||
},
|
||||
fakeBogies = {
|
||||
{group = 1, position = 3.5671, offset = 0},
|
||||
{group = 1, position = -3.5671, offset = 0},
|
||||
{group = 3, position = 3.5671, offset = 0},
|
||||
{group = 11, position = -3.5671, offset = 0},
|
||||
},
|
||||
},
|
||||
},
|
||||
soundSet = { name = "train_steam_old", horn = "vehicle/train_steam_old/steam_horn_12.wav" }
|
||||
},
|
||||
transportVehicle = {
|
||||
carrier = "RAIL"
|
||||
},
|
||||
availability = {
|
||||
yearFrom = 1884,
|
||||
yearTo = 1894
|
||||
},
|
||||
cost = {
|
||||
price = 500000
|
||||
},
|
||||
maintenance = {
|
||||
runningCosts = 300000,
|
||||
lifespan = 50
|
||||
},
|
||||
particleSystem = {
|
||||
emitters = {
|
||||
{
|
||||
position = { -5.1704, .0, 4.6238 },
|
||||
velocity = { .0, .0, 10.0 },
|
||||
color = { .3, .3, .3 },
|
||||
frequency = 100,
|
||||
lifeTime = 15.0,
|
||||
size01 = { 1, 12.0 },
|
||||
child = 1
|
||||
},{
|
||||
position = { 5.1704, .0, 4.6238 },
|
||||
velocity = { .0, .0, 10.0 },
|
||||
color = { .3, .3, .3 },
|
||||
frequency = 100,
|
||||
lifeTime = 15.0,
|
||||
size01 = { 1, 12.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { -5.8583, 1.008, .2671 },
|
||||
velocity = { .0, 4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { -5.8583, -1.008, .2671 },
|
||||
velocity = { .0, -4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { 5.8583, 1.008, .2671 },
|
||||
velocity = { .0, 4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
},
|
||||
{
|
||||
position = { 5.8583, -1.008, .2671 },
|
||||
velocity = { .0, -4.0, 0.0 },
|
||||
color = { .4, .4, .4 },
|
||||
frequency = 12,
|
||||
lifeTime = 10.0,
|
||||
size01 = { .8, 10.0 },
|
||||
child = 1
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
end
|
||||
|
||||
CostIndex = S;
|
||||
Loading…
Reference in New Issue