metrostroi-repo/MetrostroiAddon
1
0
Fork 0
mirror of https://github.com/metrostroi-repo/MetrostroiAddon.git synced 2026-05-02 00:42:29 +00:00
Code Activity

New pneumatics back compatibility fix

Browse Source
This commit is contained in:
Moon Horse
2025-12-14 15:29:14 +03:00
parent 69fe103a5e
commit fab9bb59bb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lua/metrostroi/systems/sys_81_717_pneumatic.lua
View File

@@ -411,11 +411,12 @@ function TRAIN_SYSTEM:Think(dT)
Train.Panel.UAVACOpened = (1-Train.UAVAC.Value)*((CurTime()-CurTime()%0.5)%1) Train.Panel.UAVACOpened = (1-Train.UAVAC.Value)*((CurTime()-CurTime()%0.5)%1)
end end
if not Train.CarCount and (Train:GetClass():match("81%-71[74]_mvm") or Train:GetClass():match("81%-71[74]_lvz")) then if not Train.CarCount and Train.IgnoreEngine == false then
if Train.IgnoreEngine == false then if (Train:GetClass():match("81%-71[74]_mvm") or Train:GetClass():match("81%-71[74]_lvz")) then
self:TriggerInput("NewPneumatics",1) self:TriggerInput("NewPneumatics",1)
Train.CarCount = #Train.WagonList
end end
Train.CarCount = #Train.WagonList
Train.InitIsoCountNeeded = true
--if self.NewPneumatics == 1 then print(Format("Forein train new pneumatics installed for [%s] train class",Train:GetClass())) end --if self.NewPneumatics == 1 then print(Format("Forein train new pneumatics installed for [%s] train class",Train:GetClass())) end
end end
@@ -1080,7 +1081,7 @@ function TRAIN_SYSTEM:Think(dT)
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
-- Simulate compressor operation and train line depletion -- Simulate compressor operation and train line depletion
self.Compressor = Train.KK.Value * (Train.Electric.Aux750V > 550 and 1 or 0) self.Compressor = Train.KK.Value * (Train.Electric.Aux750V > 550 and 1 or 0)
self.TrainLinePressure = self.TrainLinePressure - (Train.AirConsumeRatio or 1)*trainLineConsumption_dPdT*dT self.TrainLinePressure = self.TrainLinePressure - (Train.AirConsumeRatio or 0.1)*trainLineConsumption_dPdT*dT
if self.Compressor == 1 then self:equalizePressure(dT,"TrainLinePressure", 10.0, Train.CompressorEfficiency or 0.04) end if self.Compressor == 1 then self:equalizePressure(dT,"TrainLinePressure", 10.0, Train.CompressorEfficiency or 0.04) end
self:equalizePressure(dT,"TrainLinePressure", 0,Train.AirLeakRatio or 0.003) self:equalizePressure(dT,"TrainLinePressure", 0,Train.AirLeakRatio or 0.003)
-- Overpressure -- Overpressure
@@ -1100,7 +1101,7 @@ function TRAIN_SYSTEM:Think(dT)
Train.AK:TriggerInput( "Close",self.TrainLinePressure < 6.3) Train.AK:TriggerInput( "Close",self.TrainLinePressure < 6.3)
Train.BPT:TriggerInput("Set", (IsValid(Train.FrontBogey) and Train.FrontBogey.BrakeCylinderPressure+(not Train.FrontBogey.DisableParking and Train.FrontBogey.ParkingBrakePressure or 0) or self.BrakeCylinderPressure)>0.3) Train.BPT:TriggerInput("Set", (IsValid(Train.FrontBogey) and Train.FrontBogey.BrakeCylinderPressure+(not Train.FrontBogey.DisableParking and Train.FrontBogey.ParkingBrakePressure or 0) or self.BrakeCylinderPressure)>0.3)
Train.DKPT:TriggerInput("Set", self.BrakeCylinderPressure > 0.3) Train.DKPT:TriggerInput("Set", self.BrakeCylinderPressure > 0.3)
if self.HeadCarPneumatic and self.HeadCarPneumatic == 1 or not self.NewPneumatics then if self.HeadCarPneumatic and self.HeadCarPneumatic == 1 or self.NewPneumatics ~= 1 then
Train.AVU:TriggerInput("Open", self.BrakeLinePressure < 2.7) Train.AVU:TriggerInput("Open", self.BrakeLinePressure < 2.7)
Train.AVU:TriggerInput("Close",self.BrakeLinePressure > 3.5) Train.AVU:TriggerInput("Close",self.BrakeLinePressure > 3.5)
Train.SOT:TriggerInput("Open", self.EPKPressure < 1.3) Train.SOT:TriggerInput("Open", self.EPKPressure < 1.3)

2
lua/metrostroi/systems/sys_pr_14x_panels.lua
View File

@@ -31,7 +31,7 @@ function TRAIN_SYSTEM:Initialize()
-- Реле-повторитель провода 8 (РП8) -- Реле-повторитель провода 8 (РП8)
self.Train:LoadSystem("Rp8","Relay","REV-811T",{open_time = 0.2,bass = true }) self.Train:LoadSystem("Rp8","Relay","REV-811T",{open_time = 0.2,bass = true })
-- Контактор дверей (КД) -- Контактор дверей (КД)
self.Train:LoadSystem("KD","Relay","REV-811T",{ bass = true, close_time = 0.5 }) self.Train:LoadSystem("KD","Relay","REV-811T",{ bass = true, close_time = 0.3 })
-- Реле остановки (РО) -- Реле остановки (РО)
self.Train:LoadSystem("RO","Relay","KPD-110E",{ bass = true, close_time = 0--[[ , close_time = 0.1--]] }) self.Train:LoadSystem("RO","Relay","KPD-110E",{ bass = true, close_time = 0--[[ , close_time = 0.1--]] })
end end