From 14499cb931bda2f8ae8c566e327e94822dd1064d Mon Sep 17 00:00:00 2001 From: kosmik641 Date: Tue, 10 May 2022 16:08:24 +0300 Subject: [PATCH] =?UTF-8?q?81-722.=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=A3=D0=9F=D0=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/entities/gmod_subway_81-722/cl_init.lua | 2 +- lua/entities/gmod_subway_81-722/init.lua | 2 +- lua/metrostroi/systems/sys_81_722_electric.lua | 4 ++-- lua/metrostroi/systems/sys_81_722_panel.lua | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/entities/gmod_subway_81-722/cl_init.lua b/lua/entities/gmod_subway_81-722/cl_init.lua index 6098b89..69ef021 100644 --- a/lua/entities/gmod_subway_81-722/cl_init.lua +++ b/lua/entities/gmod_subway_81-722/cl_init.lua @@ -273,7 +273,7 @@ ENT.ButtonMap["PPZ"] = { {ID = "SF7Toggle", x=0+15.15*6, y=40+167*0, w=15,h=45, tooltip="SF7:Двери(управление)"}, {ID = "SF8Toggle", x=0+15.15*7, y=40+167*0, w=15,h=45, tooltip="SF8:БАРС 1"}, {ID = "SF9Toggle", x=0+15.15*8, y=40+167*0, w=15,h=45, tooltip="SF9:БАРС 2"}, - {ID = "R_UPOToggle", x=0+15.15*9, y=40+167*0, w=15,h=45, tooltip="SF: УПО1"}, + {ID = "SF00Toggle", x=0+15.15*9, y=40+167*0, w=15,h=45, tooltip="SF00:"}, {ID = "SF01Toggle", x=0+15.15*10, y=40+167*0, w=15,h=45, tooltip="SF01:"}, {ID = "SF10Toggle", x=0+15.15*11, y=40+167*0, w=15,h=45, tooltip="SF10:БРПИ-М1"}, {ID = "SF11Toggle", x=0+15.15*12, y=40+167*0, w=15,h=45, tooltip="SF11:БРПИ-М2"}, diff --git a/lua/entities/gmod_subway_81-722/init.lua b/lua/entities/gmod_subway_81-722/init.lua index 62e5b24..4b73885 100644 --- a/lua/entities/gmod_subway_81-722/init.lua +++ b/lua/entities/gmod_subway_81-722/init.lua @@ -4,7 +4,7 @@ include("shared.lua") ENT.BogeyDistance = 650 -- Needed for gm trainspawner ENT.SyncTable = { - "SF1","SF2","SF3","SF4","SF5","SF6","SF7","SF8","SF9","R_UPO","SF01","SF10","SF11","SF12","SF13","SF02", + "SF1","SF2","SF3","SF4","SF5","SF6","SF7","SF8","SF9","SF00","SF01","SF10","SF11","SF12","SF13","SF02", "SF14","SF15","SF16","SF17","SF18","SF19","SF20","SF21","SF22","SF23","SF24","SF25","SF26","SF27","SF03","SF04", "SF31","SF32","SF33","SF34","SF35","SF36","SF37","SF38","SF41","SF42","SF43","SF44","SF45","SF46","SF47","SF48","SF49","SF51","SF52","SF53","SF54","SF55","SF56","SF57","SF58","SF59", diff --git a/lua/metrostroi/systems/sys_81_722_electric.lua b/lua/metrostroi/systems/sys_81_722_electric.lua index 12d3ac7..9ef7f04 100644 --- a/lua/metrostroi/systems/sys_81_722_electric.lua +++ b/lua/metrostroi/systems/sys_81_722_electric.lua @@ -192,8 +192,8 @@ function TRAIN_SYSTEM:Think(dT) Panel.ARSPower = Panel.BARSPower*(1-Train.BUKP.Back)*Train.ARS.Value Panel.ALSPower = BO*(1-Train.BUKP.Back)*Train.ALS.Value - Panel.UPOPower = BO*S["RV"]*Train.R_UPO.Value - Train:WriteTrainWire(15,BO*(Train.UPO.LineOut*Train.SarmatUPO.UPOActive+Train.SarmatUPO.LineOut)) + Panel.UPOPower = BO*S["RV"]*Train.SarmatUPO.UPOActive + Train:WriteTrainWire(15,BO*(Train.SarmatUPO.LineOut + Train.SarmatUPO.LineOut)) --print(W[15],Train.UPO.LineOut*Train.SarmatUPO.UPOActive,Train.SarmatUPO.LineOut) self.Emer = S["RU"] diff --git a/lua/metrostroi/systems/sys_81_722_panel.lua b/lua/metrostroi/systems/sys_81_722_panel.lua index 05c9378..343cdbc 100644 --- a/lua/metrostroi/systems/sys_81_722_panel.lua +++ b/lua/metrostroi/systems/sys_81_722_panel.lua @@ -17,7 +17,7 @@ function TRAIN_SYSTEM:Initialize() self.Train:LoadSystem("SF7","Relay","Switch",{normally_closed = true,bass=true}) self.Train:LoadSystem("SF8","Relay","Switch",{normally_closed = true,bass=true}) self.Train:LoadSystem("SF9","Relay","Switch",{normally_closed = true,bass=true}) - self.Train:LoadSystem("R_UPO","Relay","Switch",{normally_closed = true,bass=true}) + self.Train:LoadSystem("SF00","Relay","Switch",{bass=true}) self.Train:LoadSystem("SF01","Relay","Switch",{bass=true}) self.Train:LoadSystem("SF10","Relay","Switch",{bass=true}) self.Train:LoadSystem("SF11","Relay","Switch",{bass=true})