diff --git a/res/models/mesh/vehicle/tram/KTM1blue/ktm2_body_lod0.msh.blob b/res/models/mesh/vehicle/tram/KTM1blue/ktm2_body_lod0.msh.blob index c9db7c8..57b85a8 100644 Binary files a/res/models/mesh/vehicle/tram/KTM1blue/ktm2_body_lod0.msh.blob and b/res/models/mesh/vehicle/tram/KTM1blue/ktm2_body_lod0.msh.blob differ diff --git a/res/models/mesh/vehicle/tram/KTM1red/ktm2_body_lod0.msh.blob b/res/models/mesh/vehicle/tram/KTM1red/ktm2_body_lod0.msh.blob index c9db7c8..57b85a8 100644 Binary files a/res/models/mesh/vehicle/tram/KTM1red/ktm2_body_lod0.msh.blob and b/res/models/mesh/vehicle/tram/KTM1red/ktm2_body_lod0.msh.blob differ diff --git a/res/models/mesh/vehicle/tram/KTM2/ktm2_body_lod0.msh.blob b/res/models/mesh/vehicle/tram/KTM2/ktm2_body_lod0.msh.blob index 85a8827..a3bf08a 100644 Binary files a/res/models/mesh/vehicle/tram/KTM2/ktm2_body_lod0.msh.blob and b/res/models/mesh/vehicle/tram/KTM2/ktm2_body_lod0.msh.blob differ diff --git a/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh b/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh index fbd9fb6..d090d7f 100644 --- a/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh +++ b/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh @@ -1,22 +1,23 @@ +-- Generated by Train Fever Model Converter version 0.3.5481.4047 function data() return { animations = { - }, - matConfigs = { { 0, }, }, - subMeshes = { { - indices = { - normal = { count = 67440, offset = 551328, }, - position = { count = 67440, offset = 618768, }, - tangent = { count = 67440, offset = 686208, }, - uv0 = { count = 67440, offset = 753648, }, + matConfigs = { { 0 } }, + subMeshes = { + { -- Object 0 + indices = { + position = { count = 67896, offset = 0, }, + normal = { count = 67896, offset = 67896, }, + uv0 = { count = 67896, offset = 135792, }, + tangent = { count = 67896, offset = 203688, }, + }, + materials = { "vehicle/tram/KTM5M3.mtl" }, }, - materials = { "vehicle/tram/KTM5M3.mtl" }, - }, }, - vertexAttr = - { - normal = { count = 137832, numComp = 3, offset = 0, }, - position = { count = 137832, numComp = 3, offset = 137832, }, - tangent = { count = 183776, numComp = 4, offset = 275664, }, - uv0 = { count = 91888, numComp = 2, offset = 459440, }, }, -} end \ No newline at end of file + vertexAttr = { + position = { count = 203688, numComp = 3, offset = 271584, }, + normal = { count = 203688, numComp = 3, offset = 475272, }, + uv0 = { count = 135792, numComp = 2, offset = 678960, }, + tangent = { count = 271584, numComp = 4, offset = 814752, }, + }, +} end diff --git a/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh.blob b/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh.blob index 7f3e922..76d4bff 100644 Binary files a/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh.blob and b/res/models/mesh/vehicle/tram/KTM5M3/ktm5m3.msh.blob differ diff --git a/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh b/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh index 27ae625..aadb70d 100644 --- a/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh +++ b/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh @@ -1,22 +1,23 @@ +-- Generated by Train Fever Model Converter version 0.3.5481.4047 function data() return { animations = { - }, - matConfigs = { { 0, }, }, - subMeshes = { { - indices = { - normal = { count = 60624, offset = 500400, }, - position = { count = 60624, offset = 561024, }, - tangent = { count = 60624, offset = 621648, }, - uv0 = { count = 60624, offset = 682272, }, + matConfigs = { { 0 } }, + subMeshes = { + { -- Object 0 + indices = { + position = { count = 61524, offset = 0, }, + normal = { count = 61524, offset = 61524, }, + uv0 = { count = 61524, offset = 123048, }, + tangent = { count = 61524, offset = 184572, }, + }, + materials = { "vehicle/tram/TatraT3.mtl" }, }, - materials = { "vehicle/tram/TatraT3.mtl" }, - }, }, - vertexAttr = - { - normal = { count = 125100, numComp = 3, offset = 0, }, - position = { count = 125100, numComp = 3, offset = 125100, }, - tangent = { count = 166800, numComp = 4, offset = 250200, }, - uv0 = { count = 83400, numComp = 2, offset = 417000, }, }, -} end \ No newline at end of file + vertexAttr = { + position = { count = 184572, numComp = 3, offset = 246096, }, + normal = { count = 184572, numComp = 3, offset = 430668, }, + uv0 = { count = 123048, numComp = 2, offset = 615240, }, + tangent = { count = 246096, numComp = 4, offset = 738288, }, + }, +} end diff --git a/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh.blob b/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh.blob index 714cd66..f88656b 100644 Binary files a/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh.blob and b/res/models/mesh/vehicle/tram/TatraT3/TatraT3.msh.blob differ diff --git a/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh b/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh index 0f335ad..5692b97 100644 --- a/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh +++ b/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh @@ -6,18 +6,18 @@ function data() return { subMeshes = { { -- Object 0 indices = { - position = { count = 35616, offset = 0, }, - normal = { count = 35616, offset = 35616, }, - uv0 = { count = 35616, offset = 71232, }, - tangent = { count = 35616, offset = 106848, }, + position = { count = 35568, offset = 0, }, + normal = { count = 35568, offset = 35568, }, + uv0 = { count = 35568, offset = 71136, }, + tangent = { count = 35568, offset = 106704, }, }, materials = { "vehicle/tram/Xtram.mtl" }, }, }, vertexAttr = { - position = { count = 106848, numComp = 3, offset = 142464, }, - normal = { count = 106848, numComp = 3, offset = 249312, }, - uv0 = { count = 71232, numComp = 2, offset = 356160, }, - tangent = { count = 142464, numComp = 4, offset = 427392, }, + position = { count = 106704, numComp = 3, offset = 142272, }, + normal = { count = 106704, numComp = 3, offset = 248976, }, + uv0 = { count = 71136, numComp = 2, offset = 355680, }, + tangent = { count = 142272, numComp = 4, offset = 426816, }, }, } end diff --git a/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh.blob b/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh.blob index 6ec9a8e..c04ba06 100644 Binary files a/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh.blob and b/res/models/mesh/vehicle/tram/x_tram/x_tram_body_lod0.msh.blob differ diff --git a/res/models/model/vehicle/tram/KTM5M3.mdl b/res/models/model/vehicle/tram/KTM5M3.mdl index a0dc23d..1086425 100644 --- a/res/models/model/vehicle/tram/KTM5M3.mdl +++ b/res/models/model/vehicle/tram/KTM5M3.mdl @@ -70,7 +70,7 @@ return { axles = { "vehicle/tram/KTM5M3/ktm5m3_w.msh"} } }, - topSpeed = 70, + topSpeed = 75, weight = 18.65, engines = { { type = "ELECTRIC", power = 180.0, tractiveEffort = 20.0 } @@ -80,19 +80,19 @@ return { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 68 } + { type = "PASSENGERS", capacity = 120 } }, loadSpeed = 3 }, availability = { yearFrom = 1971, - yearTo = 1993 + yearTo = 1989 }, cost = { - price = 170000 + price = 250000 }, maintenance = { - runningCosts = 28000, + runningCosts = 48000, lifespan = 25 } }, diff --git a/res/models/model/vehicle/tram/KTM5M3_2x.mdl b/res/models/model/vehicle/tram/KTM5M3_2x.mdl index 86d538e..a9fe6bc 100644 --- a/res/models/model/vehicle/tram/KTM5M3_2x.mdl +++ b/res/models/model/vehicle/tram/KTM5M3_2x.mdl @@ -85,29 +85,29 @@ return { axles = { "vehicle/tram/KTM5M3/ktm5m3_w.msh"} } }, - topSpeed = 60, - weight = 18.65, + topSpeed = 75, + weight = 37.3, engines = { - { type = "ELECTRIC", power = 360.0, tractiveEffort = 40.0 } + { type = "ELECTRIC", power = 180.0, tractiveEffort = 20.0 } }, soundSet = "tram_modern" }, transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 136 } + { type = "PASSENGERS", capacity = 240 } }, - loadSpeed = 6 + loadSpeed = 3 }, availability = { yearFrom = 1971, - yearTo = 1993 + yearTo = 1989 }, cost = { - price = 340000 + price = 500000 }, maintenance = { - runningCosts = 50000, + runningCosts = 96000, lifespan = 25 } }, diff --git a/res/models/model/vehicle/tram/TatraT3.mdl b/res/models/model/vehicle/tram/TatraT3.mdl index c584b78..aaca29c 100644 --- a/res/models/model/vehicle/tram/TatraT3.mdl +++ b/res/models/model/vehicle/tram/TatraT3.mdl @@ -81,7 +81,7 @@ return { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 60 } + { type = "PASSENGERS", capacity = 100 } }, loadSpeed = 3 }, @@ -90,10 +90,10 @@ return { yearTo = 1989 }, cost = { - price = 180000 + price = 240000 }, maintenance = { - runningCosts = 32000, + runningCosts = 40000, lifespan = 40 } }, diff --git a/res/models/model/vehicle/tram/TatraT3_2x.mdl b/res/models/model/vehicle/tram/TatraT3_2x.mdl index e15f128..e74b8bc 100644 --- a/res/models/model/vehicle/tram/TatraT3_2x.mdl +++ b/res/models/model/vehicle/tram/TatraT3_2x.mdl @@ -96,7 +96,7 @@ return { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 120 } + { type = "PASSENGERS", capacity = 200 } }, loadSpeed = 6 }, @@ -105,10 +105,10 @@ return { yearTo = 1989 }, cost = { - price = 360000 + price = 480000 }, maintenance = { - runningCosts = 64000, + runningCosts = 80000, lifespan = 40 } }, diff --git a/res/models/model/vehicle/tram/ktm1-1blue.mdl b/res/models/model/vehicle/tram/ktm1-1blue.mdl new file mode 100644 index 0000000..f619a1d --- /dev/null +++ b/res/models/model/vehicle/tram/ktm1-1blue.mdl @@ -0,0 +1,167 @@ +function data() +return { +boundingInfo = { + bbMax = { + 5.3, 0.98381000757217, 4.8104958534241, + }, + bbMin = { + -5.3, -0.98381000757217, -0.33427900075912, + }, + + }, + lods = { + { + animations = { + + }, + children = { + { + id = "vehicle/tram/KTM1blue_lod0_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 0, + visibleTo = 100, + + }, + { + animations = { + + }, + children = { + { + id = "vehicle/tram/KTM1blue_lod1_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 100, + visibleTo = 500, + + }, +{ + animations = { + + }, + children = { + { + id = "vehicle/tram/KTM1blue_lod2_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.08, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 500, + visibleTo = 2200, + + }, + }, + metadata = { + description = { + name = _("КТМ1"), + description = _("КТМ-1 - советский моторный двухосный трамвай. Один из первых советских послевоенных трамвайных вагонов. В конструкции трамвая КТМ были применены как прогрессивные (несущий кузов) так и устаревшие (непосредственная система управления и двухосная схема) решения.") + }, + railVehicle = { + configs = { + { + axles = { "vehicle/tram/KTM1blue/ktm2_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/KTM1blue/ktm2_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/KTM1blue/ktm2_w_lod2.msh" }, + + } + }, + topSpeed = 40, + weight = 10.25, + engines = { + { type = "ELECTRIC", power = 92.0, tractiveEffort = 35.0 } + }, + soundSet = "tram_old" + }, + transportVehicle = { + carrier = "TRAM", + capacities = { + { type = "PASSENGERS", capacity = 48 } + }, + loadSpeed = 4 + }, + availability = { + yearFrom = 1947, + yearTo = 1961 + }, + cost = { + price = 95000 + }, + maintenance = { + runningCosts = 20000, + lifespan = 30 + } + }, + +} +end diff --git a/res/models/model/vehicle/tram/ktm1-1red.mdl b/res/models/model/vehicle/tram/ktm1-1red.mdl new file mode 100644 index 0000000..f443ebb --- /dev/null +++ b/res/models/model/vehicle/tram/ktm1-1red.mdl @@ -0,0 +1,167 @@ +function data() +return { +boundingInfo = { + bbMax = { + 5.3, 0.98381000757217, 4.8104958534241, + }, + bbMin = { + -5.3, -0.98381000757217, -0.33427900075912, + }, + + }, + lods = { + { + animations = { + + }, + children = { + { + id = "vehicle/tram/ktm1red_lod0_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 0, + visibleTo = 100, + + }, + { + animations = { + + }, + children = { + { + id = "vehicle/tram/ktm1red_lod1_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 100, + visibleTo = 500, + + }, +{ + animations = { + + }, + children = { + { + id = "vehicle/tram/ktm1red_lod2_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 500, + visibleTo = 2200, + + }, + }, + metadata = { + description = { + name = _("КТМ1"), + description = _("КТМ-1 - советский моторный двухосный трамвай. Один из первых советских послевоенных трамвайных вагонов. В конструкции трамвая КТМ были применены как прогрессивные (несущий кузов) так и устаревшие (непосредственная система управления и двухосная схема) решения.") + }, + railVehicle = { + configs = { + { + axles = { "vehicle/tram/KTM1red/ktm2_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/KTM1red/ktm2_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/KTM1red/ktm2_w_lod2.msh" }, + + } + }, + topSpeed = 40, + weight = 10.25, + engines = { + { type = "ELECTRIC", power = 92.0, tractiveEffort = 35.0 } + }, + soundSet = "tram_old" + }, + transportVehicle = { + carrier = "TRAM", + capacities = { + { type = "PASSENGERS", capacity = 48 } + }, + loadSpeed = 4 + }, + availability = { + yearFrom = 1947, + yearTo = 1961 + }, + cost = { + price = 95000 + }, + maintenance = { + runningCosts = 20000, + lifespan = 30 + } + }, + +} +end diff --git a/res/models/model/vehicle/tram/ktm1blue.mdl b/res/models/model/vehicle/tram/ktm1blue.mdl index ceed9f4..29dfdc7 100644 --- a/res/models/model/vehicle/tram/ktm1blue.mdl +++ b/res/models/model/vehicle/tram/ktm1blue.mdl @@ -186,7 +186,7 @@ boundingInfo = { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 48 } + { type = "PASSENGERS", capacity = 96 } }, loadSpeed = 4 }, @@ -195,10 +195,10 @@ boundingInfo = { yearTo = 1961 }, cost = { - price = 75000 + price = 190000 }, maintenance = { - runningCosts = 13000, + runningCosts = 40000, lifespan = 30 } }, diff --git a/res/models/model/vehicle/tram/ktm1red.mdl b/res/models/model/vehicle/tram/ktm1red.mdl index 1dcffb8..96a4e6d 100644 --- a/res/models/model/vehicle/tram/ktm1red.mdl +++ b/res/models/model/vehicle/tram/ktm1red.mdl @@ -186,7 +186,7 @@ boundingInfo = { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 48 } + { type = "PASSENGERS", capacity = 96 } }, loadSpeed = 4 }, @@ -195,10 +195,10 @@ boundingInfo = { yearTo = 1961 }, cost = { - price = 75000 + price = 190000 }, maintenance = { - runningCosts = 13000, + runningCosts = 40000, lifespan = 30 } }, diff --git a/res/models/model/vehicle/tram/ktm2.mdl b/res/models/model/vehicle/tram/ktm2.mdl index 97ec894..80fdea4 100644 --- a/res/models/model/vehicle/tram/ktm2.mdl +++ b/res/models/model/vehicle/tram/ktm2.mdl @@ -186,7 +186,7 @@ boundingInfo = { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 52 } + { type = "PASSENGERS", capacity = 96 } }, loadSpeed = 4 }, @@ -195,10 +195,10 @@ boundingInfo = { yearTo = 1969 }, cost = { - price = 80000 + price = 190000 }, maintenance = { - runningCosts = 15000, + runningCosts = 40000, lifespan = 35 } }, diff --git a/res/models/model/vehicle/tram/ktm21.mdl b/res/models/model/vehicle/tram/ktm21.mdl new file mode 100644 index 0000000..45df607 --- /dev/null +++ b/res/models/model/vehicle/tram/ktm21.mdl @@ -0,0 +1,167 @@ +function data() +return { +boundingInfo = { + bbMax = { + 5.3, 0.98381000757217, 4.8104958534241, + }, + bbMin = { + -5.3, -0.98381000757217, -0.33427900075912, + }, + + }, + lods = { + { + animations = { + + }, + children = { + { + id = "vehicle/tram/ktm2_lod0_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 0, + visibleTo = 100, + + }, + { + animations = { + + }, + children = { + { + id = "vehicle/tram/ktm2_lod1_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 100, + visibleTo = 500, + + }, +{ + animations = { + + }, + children = { + { + id = "vehicle/tram/ktm2_lod2_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + + }, + matConfigs = { + { + 0, 0, + }, + }, + static = false, + visibleFrom = 500, + visibleTo = 2200, + + }, + }, + metadata = { + description = { + name = _("КТМ2"), + description = _("КТМ-2 - советский моторный двухосный трамвай. Эти трамваи поезда работали практически во всех городах СССР и выпускались до начала производства КТМ-5.") + }, + railVehicle = { + configs = { + { + axles = { "vehicle/tram/KTM2/ktm2_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/KTM2/ktm2_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/KTM2/ktm2_w_lod2.msh" }, + + } + }, + topSpeed = 45, + weight = 9.4, + engines = { + { type = "ELECTRIC", power = 100.0, tractiveEffort = 35.0 } + }, + soundSet = "tram_old" + }, + transportVehicle = { + carrier = "TRAM", + capacities = { + { type = "PASSENGERS", capacity = 48 } + }, + loadSpeed = 4 + }, + availability = { + yearFrom = 1958, + yearTo = 1969 + }, + cost = { + price = 95000 + }, + maintenance = { + runningCosts = 20000, + lifespan = 35 + } + }, + +} +end diff --git a/res/models/model/vehicle/tram/ktm2ktp2.mdl b/res/models/model/vehicle/tram/ktm2ktp2.mdl index f02f1c7..b2dad26 100644 --- a/res/models/model/vehicle/tram/ktm2ktp2.mdl +++ b/res/models/model/vehicle/tram/ktm2ktp2.mdl @@ -226,7 +226,7 @@ boundingInfo = { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 77 } + { type = "PASSENGERS", capacity = 144 } }, loadSpeed = 6 }, @@ -235,10 +235,10 @@ boundingInfo = { yearTo = 1969 }, cost = { - price = 120000 + price = 285000 }, maintenance = { - runningCosts = 22500, + runningCosts = 60000, lifespan = 35 } }, diff --git a/res/models/model/vehicle/tram/x_tram.mdl b/res/models/model/vehicle/tram/x_tram.mdl new file mode 100644 index 0000000..8762709 --- /dev/null +++ b/res/models/model/vehicle/tram/x_tram.mdl @@ -0,0 +1,102 @@ +function data() +return { +boundingInfo = { + bbMax = { + 5.93, 0.98381000757217, 4.8104958534241, + }, + bbMin = { + -5.97, -0.98381000757217, -0.33427900075912, + }, + + }, + lods = { + { + animations = { + + }, + children = { + { + id = "vehicle/tram/x_tram_lod0_front.grp", + transf = { + 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, + }, + type = "GROUP", + + }, + }, + events = { + close_all_doors = { + [1] = { + forward = true, + name = "close_doors", + }, + }, + open_all_doors = { + [1] = { + forward = true, + name = "open_doors", + }, + }, + + }, + matConfigs = { + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + }, + static = false, + visibleFrom = 0, + visibleTo = 1300, + + }, + + }, + metadata = { + description = { + name = _("Трамвайный вагон Х"), + description = _("Трамвайный вагон Х (Харьковский) - типовой серийный советский трамвайный вагон. Производился на Мытищенским Машиностроительным и Усть-Катавским Вагоностроительным заводами, а первая партия предназначалась для Харькова, почему вагон и получил индекс Х.") + }, + railVehicle = { + configs = { + { + axles = { "vehicle/tram/x_tram/x_tram_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/x_tram/x_tram_w_lod0.msh" }, + + }, + { + axles = { "vehicle/tram/x_tram/x_tram_w_lod0.msh" }, + + } + }, + topSpeed = 40, + weight = 9.9, + engines = { + { type = "ELECTRIC", power = 110.0, tractiveEffort = 40.0 } + }, + soundSet = "tram_old" + }, + transportVehicle = { + carrier = "TRAM", + capacities = { + { type = "PASSENGERS", capacity = 48 } + }, + loadSpeed = 2 + }, + availability = { + yearFrom = 1928, + yearTo = 1946 + }, + cost = { + price = 95000 + }, + maintenance = { + runningCosts = 22000, + lifespan = 45 + } + }, + +} +end diff --git a/res/models/model/vehicle/tram/xm_tram.mdl b/res/models/model/vehicle/tram/xm_tram.mdl index b6a33a0..f265418 100644 --- a/res/models/model/vehicle/tram/xm_tram.mdl +++ b/res/models/model/vehicle/tram/xm_tram.mdl @@ -57,7 +57,7 @@ boundingInfo = { }, matConfigs = { { - 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, }, static = false, @@ -97,19 +97,19 @@ boundingInfo = { transportVehicle = { carrier = "TRAM", capacities = { - { type = "PASSENGERS", capacity = 48 } + { type = "PASSENGERS", capacity = 96 } }, loadSpeed = 4 }, availability = { yearFrom = 1928, - yearTo = 1941 + yearTo = 1946 }, cost = { - price = 80000 + price = 190000 }, maintenance = { - runningCosts = 15000, + runningCosts = 44000, lifespan = 45 } }, diff --git a/res/textures/models/vehicle/tram/KTM1blue.tga b/res/textures/models/vehicle/tram/KTM1blue.tga index 99379cf..04614f8 100644 Binary files a/res/textures/models/vehicle/tram/KTM1blue.tga and b/res/textures/models/vehicle/tram/KTM1blue.tga differ diff --git a/res/textures/models/vehicle/tram/KTM1red.tga b/res/textures/models/vehicle/tram/KTM1red.tga index 895f946..718ae3f 100644 Binary files a/res/textures/models/vehicle/tram/KTM1red.tga and b/res/textures/models/vehicle/tram/KTM1red.tga differ diff --git a/res/textures/models/vehicle/tram/KTM2.tga b/res/textures/models/vehicle/tram/KTM2.tga index 4c30c1b..4590cc6 100644 Binary files a/res/textures/models/vehicle/tram/KTM2.tga and b/res/textures/models/vehicle/tram/KTM2.tga differ diff --git a/res/textures/models/vehicle/tram/Xtram.tga b/res/textures/models/vehicle/tram/Xtram.tga index e26adfb..d98041c 100644 Binary files a/res/textures/models/vehicle/tram/Xtram.tga and b/res/textures/models/vehicle/tram/Xtram.tga differ diff --git a/res/textures/models/vehicle/tram/Xtram_nrml.tga b/res/textures/models/vehicle/tram/Xtram_nrml.tga index f727e0c..f35d964 100644 Binary files a/res/textures/models/vehicle/tram/Xtram_nrml.tga and b/res/textures/models/vehicle/tram/Xtram_nrml.tga differ diff --git a/res/textures/models/vehicle/waggon/2axlemv.tga b/res/textures/models/vehicle/waggon/2axlemv.tga index 791a533..a45e214 100644 Binary files a/res/textures/models/vehicle/waggon/2axlemv.tga and b/res/textures/models/vehicle/waggon/2axlemv.tga differ diff --git a/res/textures/ui/models_small/vehicle/tram/ktm1-1blue.tga b/res/textures/ui/models_small/vehicle/tram/ktm1-1blue.tga new file mode 100644 index 0000000..66da36f Binary files /dev/null and b/res/textures/ui/models_small/vehicle/tram/ktm1-1blue.tga differ diff --git a/res/textures/ui/models_small/vehicle/tram/ktm1-1red.tga b/res/textures/ui/models_small/vehicle/tram/ktm1-1red.tga new file mode 100644 index 0000000..7f1a8c5 Binary files /dev/null and b/res/textures/ui/models_small/vehicle/tram/ktm1-1red.tga differ diff --git a/res/textures/ui/models_small/vehicle/tram/ktm21.tga b/res/textures/ui/models_small/vehicle/tram/ktm21.tga new file mode 100644 index 0000000..951813a Binary files /dev/null and b/res/textures/ui/models_small/vehicle/tram/ktm21.tga differ diff --git a/res/textures/ui/models_small/vehicle/tram/x_tram.tga b/res/textures/ui/models_small/vehicle/tram/x_tram.tga new file mode 100644 index 0000000..cdcd3bc Binary files /dev/null and b/res/textures/ui/models_small/vehicle/tram/x_tram.tga differ