From 9248e1f56b894f6db58206ea7dcb75f8bfa46e7a Mon Sep 17 00:00:00 2001 From: kosmik641 Date: Tue, 10 May 2022 16:18:57 +0300 Subject: [PATCH] =?UTF-8?q?81-722.=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BC=20=D0=A6=D0=98=D0=9A=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5?= 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 | 6 +- lua/entities/gmod_subway_81-722/shared.lua | 6 +- lua/entities/gmod_subway_81-723/init.lua | 12 +--- lua/entities/gmod_subway_81-723/shared.lua | 4 +- lua/entities/gmod_subway_81-724/init.lua | 6 +- lua/entities/gmod_subway_81-724/shared.lua | 4 +- .../systems/sys_81_722_electric.lua | 5 +- .../systems/sys_81_722_passscheme.lua | 4 +- .../systems/sys_81_722_sarmat_upo.lua | 64 +++++++++---------- lua/metrostroi/systems/sys_81_722_tickers.lua | 4 +- 11 files changed, 55 insertions(+), 62 deletions(-) diff --git a/lua/entities/gmod_subway_81-722/cl_init.lua b/lua/entities/gmod_subway_81-722/cl_init.lua index 69ef021..b502d30 100644 --- a/lua/entities/gmod_subway_81-722/cl_init.lua +++ b/lua/entities/gmod_subway_81-722/cl_init.lua @@ -1162,7 +1162,7 @@ ENT.ButtonMap["Sarmat"] = { height = 640, scale = 0.02*0.567, sensor = true, - system = "SarmatUPO", + system = "BMCIK", hideseat=0.2, hide=true, } diff --git a/lua/entities/gmod_subway_81-722/init.lua b/lua/entities/gmod_subway_81-722/init.lua index 4b73885..0af958e 100644 --- a/lua/entities/gmod_subway_81-722/init.lua +++ b/lua/entities/gmod_subway_81-722/init.lua @@ -340,9 +340,9 @@ function ENT:Think() self:SetPackedBool("DoorAlarmL",self.BUKV.CloseRing) self:SetPackedBool("DoorAlarmR",self.BUKV.CloseRing) - self:SetNW2Int("PassSchemesLED",self.PassSchemes.PassSchemeCurr) - self:SetNW2Int("PassSchemesLEDN",self.PassSchemes.PassSchemeNext) - self:SetPackedBool("PassSchemesLEDO",self.PassSchemes.PassSchemePath) + self:SetNW2Int("PassSchemesLED",self.BNT.PassSchemeCurr) + self:SetNW2Int("PassSchemesLEDN",self.BNT.PassSchemeNext) + self:SetPackedBool("PassSchemesLEDO",self.BNT.PassSchemePath) self:SetPackedBool("SarmatLeft",self.Panel.PassSchemePowerL) self:SetPackedBool("SarmatRight",self.Panel.PassSchemePowerR) diff --git a/lua/entities/gmod_subway_81-722/shared.lua b/lua/entities/gmod_subway_81-722/shared.lua index 4f23225..6df0256 100644 --- a/lua/entities/gmod_subway_81-722/shared.lua +++ b/lua/entities/gmod_subway_81-722/shared.lua @@ -281,10 +281,10 @@ function ENT:InitializeSystems() self:LoadSystem("Panel","81_722_Panel") self:LoadSystem("Announcer","81_71_Announcer", "AnnouncementsSarmatUPO") - self:LoadSystem("SarmatUPO","81_722_sarmat") + self:LoadSystem("BMCIK","81_722_BMCIK") self:LoadSystem("UPO","81_71_UPO") - self:LoadSystem("Tickers","81_722_Tickers") - self:LoadSystem("PassSchemes","81_722_PassScheme") + self:LoadSystem("BIT","81_722_BIT") + self:LoadSystem("BNT","81_722_BNT") end diff --git a/lua/entities/gmod_subway_81-723/init.lua b/lua/entities/gmod_subway_81-723/init.lua index 8b3c517..e274a34 100644 --- a/lua/entities/gmod_subway_81-723/init.lua +++ b/lua/entities/gmod_subway_81-723/init.lua @@ -115,12 +115,6 @@ function ENT:Think() --self:SetPackedBool("BattPressed",self.BUKV.BatteryPressed) - self:SetNW2Int("PassSchemesLED",self.PassSchemes.PassSchemeCurr) - self:SetNW2Int("PassSchemesLEDN",self.PassSchemes.PassSchemeNext) - self:SetPackedBool("PassSchemesLEDO",self.PassSchemes.PassSchemePath) - self:SetPackedBool("SarmatLeft",self.Panel.PassSchemePowerL) - self:SetPackedBool("SarmatRight",self.Panel.PassSchemePowerR) - self:SetPackedBool("CompressorWork",self.Pneumatic.Compressor) --self:SetPackedRatio("Cran", self.Pneumatic.DriverValvePosition) @@ -138,9 +132,9 @@ function ENT:Think() self:SetPackedBool("DoorAlarmL",self.BUKV.CloseRing) self:SetPackedBool("DoorAlarmR",self.BUKV.CloseRing) - self:SetNW2Int("PassSchemesLED",self.PassSchemes.PassSchemeCurr) - self:SetNW2Int("PassSchemesLEDN",self.PassSchemes.PassSchemeNext) - self:SetPackedBool("PassSchemesLEDO",self.PassSchemes.PassSchemePath) + self:SetNW2Int("PassSchemesLED",self.BNT.PassSchemeCurr) + self:SetNW2Int("PassSchemesLEDN",self.BNT.PassSchemeNext) + self:SetPackedBool("PassSchemesLEDO",self.BNT.PassSchemePath) self:SetPackedBool("SarmatLeft",self.Panel.PassSchemePowerL) self:SetPackedBool("SarmatRight",self.Panel.PassSchemePowerR) diff --git a/lua/entities/gmod_subway_81-723/shared.lua b/lua/entities/gmod_subway_81-723/shared.lua index 4c07eea..70d6077 100644 --- a/lua/entities/gmod_subway_81-723/shared.lua +++ b/lua/entities/gmod_subway_81-723/shared.lua @@ -158,8 +158,8 @@ function ENT:InitializeSystems() self:LoadSystem("Panel","81_723_Panel") self:LoadSystem("Announcer","81_71_Announcer", "AnnouncementsSarmatUPO") - self:LoadSystem("Tickers","81_722_Tickers") - self:LoadSystem("PassSchemes","81_722_PassScheme") + self:LoadSystem("BIT","81_722_BIT") + self:LoadSystem("BNT","81_722_BNT") end diff --git a/lua/entities/gmod_subway_81-724/init.lua b/lua/entities/gmod_subway_81-724/init.lua index ab0a1ba..c0e05bf 100644 --- a/lua/entities/gmod_subway_81-724/init.lua +++ b/lua/entities/gmod_subway_81-724/init.lua @@ -104,9 +104,9 @@ function ENT:Think() self:SetPackedBool("BattPressed",self.BUKV.BatteryPressed) - self:SetNW2Int("PassSchemesLED",self.PassSchemes.PassSchemeCurr) - self:SetNW2Int("PassSchemesLEDN",self.PassSchemes.PassSchemeNext) - self:SetPackedBool("PassSchemesLEDO",self.PassSchemes.PassSchemePath) + self:SetNW2Int("PassSchemesLED",self.BNT.PassSchemeCurr) + self:SetNW2Int("PassSchemesLEDN",self.BNT.PassSchemeNext) + self:SetPackedBool("PassSchemesLEDO",self.BNT.PassSchemePath) self:SetPackedBool("SarmatLeft",self.Panel.PassSchemePowerL) self:SetPackedBool("SarmatRight",self.Panel.PassSchemePowerR) diff --git a/lua/entities/gmod_subway_81-724/shared.lua b/lua/entities/gmod_subway_81-724/shared.lua index a2a1ae4..a612107 100644 --- a/lua/entities/gmod_subway_81-724/shared.lua +++ b/lua/entities/gmod_subway_81-724/shared.lua @@ -132,8 +132,8 @@ function ENT:InitializeSystems() self:LoadSystem("Panel","81_724_Panel") self:LoadSystem("Announcer","81_71_Announcer", "AnnouncementsSarmatUPO") - self:LoadSystem("Tickers","81_722_Tickers") - self:LoadSystem("PassSchemes","81_722_PassScheme") + self:LoadSystem("BIT","81_722_BIT") + self:LoadSystem("BNT","81_722_BNT") end diff --git a/lua/metrostroi/systems/sys_81_722_electric.lua b/lua/metrostroi/systems/sys_81_722_electric.lua index 9ef7f04..7d797fb 100644 --- a/lua/metrostroi/systems/sys_81_722_electric.lua +++ b/lua/metrostroi/systems/sys_81_722_electric.lua @@ -192,9 +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.SarmatUPO.UPOActive - Train:WriteTrainWire(15,BO*(Train.SarmatUPO.LineOut + Train.SarmatUPO.LineOut)) - --print(W[15],Train.UPO.LineOut*Train.SarmatUPO.UPOActive,Train.SarmatUPO.LineOut) + Panel.UPOPower = BO*S["RV"]*Train.BMCIK.UPOActive + Train:WriteTrainWire(15,BO*(Train.BMCIK.LineOut + Train.BMCIK.LineOut)) self.Emer = S["RU"] end diff --git a/lua/metrostroi/systems/sys_81_722_passscheme.lua b/lua/metrostroi/systems/sys_81_722_passscheme.lua index 2e836b8..8196223 100644 --- a/lua/metrostroi/systems/sys_81_722_passscheme.lua +++ b/lua/metrostroi/systems/sys_81_722_passscheme.lua @@ -1,10 +1,10 @@ -------------------------------------------------------------------------------- --- 81-722 pass schemes +-- 81-722 BNT-12 system -------------------------------------------------------------------------------- -- Copyright (C) 2013-2018 Metrostroi Team & FoxWorks Aerospace s.r.o. -- Contains proprietary code. See license.txt for additional information. -------------------------------------------------------------------------------- -Metrostroi.DefineSystem("81_722_PassScheme") +Metrostroi.DefineSystem("81_722_BNT") TRAIN_SYSTEM.DontAccelerateSimulation = true function TRAIN_SYSTEM:Initialize() diff --git a/lua/metrostroi/systems/sys_81_722_sarmat_upo.lua b/lua/metrostroi/systems/sys_81_722_sarmat_upo.lua index 30b5357..8566468 100644 --- a/lua/metrostroi/systems/sys_81_722_sarmat_upo.lua +++ b/lua/metrostroi/systems/sys_81_722_sarmat_upo.lua @@ -1,10 +1,10 @@ -------------------------------------------------------------------------------- --- 81-722 "Sarmat-UPO" announcer system +-- 81-722 BMCIK-01 system -------------------------------------------------------------------------------- -- Copyright (C) 2013-2018 Metrostroi Team & FoxWorks Aerospace s.r.o. -- Contains proprietary code. See license.txt for additional information. -------------------------------------------------------------------------------- -Metrostroi.DefineSystem("81_722_sarmat") +Metrostroi.DefineSystem("81_722_BMCIK") TRAIN_SYSTEM.DontAccelerateSimulation = true function TRAIN_SYSTEM:Initialize() @@ -325,23 +325,23 @@ if SERVER then if not self.Active then return end local tbl = Metrostroi.SarmatUPOSetup[self.Train:GetNW2Int("Announcer",1)][self.Line] if not tbl then - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"PassSchemes",nil,"Current",0) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"PassSchemes",nil,"Arrival",32) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"PassSchemes",nil,"Path",self.Path) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BNT",nil,"Current",0) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BNT",nil,"Arrival",32) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BNT",nil,"Path",self.Path) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Prev",self.Specials[self.Line]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"PrevEn",false) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Next",self.Specials[self.Line]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"NextEn",false) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"NextRight",false) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Curr",self.Specials[self.Line]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"CurrEn",false) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"CurrRight",false) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Arrived",true) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Last",false) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Closing",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Prev",self.Specials[self.Line]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"PrevEn",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Next",self.Specials[self.Line]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"NextEn",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"NextRight",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Curr",self.Specials[self.Line]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"CurrEn",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"CurrRight",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Arrived",true) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Last",false) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Closing",false) if self.Specials[self.Line] then - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Special","%g"..self.Specials[self.Line].."\n%r"..self.Specials[self.Line]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"Tickers",nil,"Special","%g"..self.Specials[self.Line].."\n%r"..self.Specials[self.Line]) end return end @@ -360,24 +360,24 @@ if SERVER then else nxt = stbl[self.Station] end - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"PassSchemes",nil,"Current",curr) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"PassSchemes",nil,"Arrival",nxt) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"PassSchemes",nil,"Path",self.Path) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BNT",nil,"Current",curr) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BNT",nil,"Arrival",nxt) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BNT",nil,"Path",self.Path) local curr,prev,nxt = tbl[self.Station],tbl[self.Station-(self.Path and -1 or 1)],tbl[self.Station-(self.Path and 1 or -1)] if not self.Arrived then prev = curr nxt = curr end - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Prev",prev and prev[2]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"PrevEn",prev and prev[3]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Next",nxt and nxt[2]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"NextEn",nxt and nxt[3]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"NextRight",nxt and nxt.right_doors) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Curr",curr and curr[2]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"CurrEn",curr and curr[3]) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"CurrRight",curr and curr.right_doors) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Arrived",self.Arrived and not self.Depeating) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Last",self.Last) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Closing",self.Depeating) - self.Train:CANWrite("Sarmat",self.Train:GetWagonNumber(),"Tickers",nil,"Special",not self.Last and (self.Arrived and (self.Depeating and curr.messagedep or not self.Depeating and curr.messagearr) or not self.Arrived and prev.messagedep)) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Prev",prev and prev[2]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"PrevEn",prev and prev[3]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Next",nxt and nxt[2]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"NextEn",nxt and nxt[3]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"NextRight",nxt and nxt.right_doors) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Curr",curr and curr[2]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"CurrEn",curr and curr[3]) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"CurrRight",curr and curr.right_doors) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Arrived",self.Arrived and not self.Depeating) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Last",self.Last) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Closing",self.Depeating) + self.Train:CANWrite("BMCIK",self.Train:GetWagonNumber(),"BIT",nil,"Special",not self.Last and (self.Arrived and (self.Depeating and curr.messagedep or not self.Depeating and curr.messagearr) or not self.Arrived and prev.messagedep)) end function TRAIN_SYSTEM:Trigger(name,value) diff --git a/lua/metrostroi/systems/sys_81_722_tickers.lua b/lua/metrostroi/systems/sys_81_722_tickers.lua index 96eda8e..d287455 100644 --- a/lua/metrostroi/systems/sys_81_722_tickers.lua +++ b/lua/metrostroi/systems/sys_81_722_tickers.lua @@ -1,10 +1,10 @@ -------------------------------------------------------------------------------- --- 81-722 tickers +-- 81-722 BIT-20 system -------------------------------------------------------------------------------- -- Copyright (C) 2013-2018 Metrostroi Team & FoxWorks Aerospace s.r.o. -- Contains proprietary code. See license.txt for additional information. -------------------------------------------------------------------------------- -Metrostroi.DefineSystem("81_722_Tickers") +Metrostroi.DefineSystem("81_722_BIT") TRAIN_SYSTEM.DontAccelerateSimulation = true function TRAIN_SYSTEM:Initialize()