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

Merge remote-tracking branch 'origin/##386,387,388,243' into ##386,387,388,243

Browse Source 
# Conflicts:
#	lua/metrostroi/systems/sys_81_717_pneumatic.lua
This commit is contained in:
Moon Horse
2022-01-15 19:48:26 +03:00
parent 0e3ec0fbb2 52f4d55fcc
commit aec6f25b8f
2 changed files with 109 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,7 +405,11 @@ function TRAIN_SYSTEM:Think(dT)
-- 013: 2 Normal pressure
if (self.RealDriverValvePosition == 2) and BLDisconnect and (TLDisconnect or self.BrakeLinePressure > 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure)) then
<<<<<<< HEAD
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure), pr_speed,Train.EPKC.Value==0 and Train.EPK.Value > 0 and pr_speed*2 or pr_speed*0.35, nil, 1.0)-- nil, 1.0)
=======
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure), pr_speed,Train.EPKC.Value==0 and Train.EPK.Value > 0 and pr_speed*2 or pr_speed*0.4, nil, 1.0)-- nil, 1.0)
>>>>>>> origin/##386,387,388,243
end
-- 013: 3 4.3 Atm