From 3ae4202267fed933c832b5c52482cc2ef0738693 Mon Sep 17 00:00:00 2001 From: kosmik641 Date: Tue, 10 May 2022 21:23:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BB=D0=B8=D0=BD=D0=B8=D0=B9=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D0=91=D0=9C=D0=A6=D0=98=D0=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/metrostroi/maps/b50.lua | 4 ++-- lua/metrostroi/maps/crossline.lua | 3 ++- lua/metrostroi/maps/crossline_m12.lua | 1 + lua/metrostroi/maps/crossline_r.lua | 1 + lua/metrostroi/maps/loopline.lua | 2 +- lua/metrostroi/maps/orange.lua | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lua/metrostroi/maps/b50.lua b/lua/metrostroi/maps/b50.lua index 63578d3..840ddfe 100644 --- a/lua/metrostroi/maps/b50.lua +++ b/lua/metrostroi/maps/b50.lua @@ -1145,7 +1145,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO RHINO",{ }, { { LED = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2}, - Name = "Индустриал.-Синеозёрн.", + Name = "Автозавдоская - Междустройская", Loop = false, { 108, @@ -1264,7 +1264,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO RHINO",{ }, { LED = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 1, 1}, - Name = "Индустриально-Авт.Юж.", + Name = "Автозавдоская - Автостанция Южная", Loop = false, { 108, diff --git a/lua/metrostroi/maps/crossline.lua b/lua/metrostroi/maps/crossline.lua index a174261..a9373eb 100644 --- a/lua/metrostroi/maps/crossline.lua +++ b/lua/metrostroi/maps/crossline.lua @@ -1,5 +1,5 @@ local Map = game.GetMap():lower() or "" -if Map:find("gm_metro_crossline_c") then +if Map:find("gm_metro_crossline_c") or Map:find("gm_metro_crossline_n") then Metrostroi.PlatformMap = "gm_metro_crossline" Metrostroi.CurrentMap = "gm_metro_crossline" else @@ -729,6 +729,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO Artur",{ },{ { --МАРШРУТ LED = {3,4,5,5,5,5,3,2}, + Name = "Кировская", { 110,"Международная","Mezhdunarodnaya", arr = {nil,"last_mejdunarodnaya"}, diff --git a/lua/metrostroi/maps/crossline_m12.lua b/lua/metrostroi/maps/crossline_m12.lua index a72a58e..0748a89 100644 --- a/lua/metrostroi/maps/crossline_m12.lua +++ b/lua/metrostroi/maps/crossline_m12.lua @@ -699,6 +699,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO Artur",{ },{ { --МАРШРУТ LED = {3,4,5,5,5,5,3,2}, + Name = "Кировская", { 909,"Международная","Mezhdunarodnaya", arr = {nil,"last_mejdunarodnaya"}, diff --git a/lua/metrostroi/maps/crossline_r.lua b/lua/metrostroi/maps/crossline_r.lua index 30891e6..0d6d22d 100644 --- a/lua/metrostroi/maps/crossline_r.lua +++ b/lua/metrostroi/maps/crossline_r.lua @@ -781,6 +781,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO Artur",{ },{ { --МАРШРУТ LED = {3,4,5,5,5,5,5}, + Name = "Кировская", { 110,"Международная","Mezhdunarodnaya", arr = {nil,"last_mejdunarodnaya"}, diff --git a/lua/metrostroi/maps/loopline.lua b/lua/metrostroi/maps/loopline.lua index f1984f3..c365800 100644 --- a/lua/metrostroi/maps/loopline.lua +++ b/lua/metrostroi/maps/loopline.lua @@ -72,7 +72,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO RHINO",{ },{ { LED = {5,6,5,6,5,5}, - Name = "Line 1", + Name = "Кольцевой", Loop = true, { 651,"Первоапрельская","First april", diff --git a/lua/metrostroi/maps/orange.lua b/lua/metrostroi/maps/orange.lua index 9384b7f..2b5bbc3 100644 --- a/lua/metrostroi/maps/orange.lua +++ b/lua/metrostroi/maps/orange.lua @@ -220,7 +220,7 @@ Metrostroi.AddSarmatUPOAnnouncer("UPO RHINO", { },{ { LED = {2, 2, 3, 3, 4, 3, 3, 3, 3, 3, 3}, - Name = "Line 1", + Name = "Orange", -- Loop = false, { 462,"Икарус","Ikarus",