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