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

#87

Browse Source
This commit is contained in:
Hellss
2021-07-12 03:31:07 +03:00
parent bb36a2066c
commit 107ad16ffc
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,8 @@ function TRAIN_SYSTEM:Think(dT)
Train:WriteTrainWire(30,self.BTB*S["RU"]*C(Panel.Controller<=-1)) Train:WriteTrainWire(30,self.BTB*S["RU"]*C(Panel.Controller<=-1))
Panel.V4 = (S["RVnE"]*C(Train.KRO.Value~=1)+S["RU"])*Train.SF6.Value Panel.V4 = (S["RVnE"]*C(Train.KRO.Value~=1)+S["RU"])*Train.SF6.Value
Train:WriteTrainWire(11,Panel.V4*Train.ParkingBrake.Value)
Train:WriteTrainWire(31,Panel.V4*(1-Train.ParkingBrake.Value))
Train:WriteTrainWire(-8,BO*min(1,(S["RV"]+S["RU"]))*Train.SF7.Value) Train:WriteTrainWire(-8,BO*min(1,(S["RV"]+S["RU"]))*Train.SF7.Value)
Train:WriteTrainWire(9,W[8]*(1-self.CabActive)*C(Train.VRU.Value==1)*Train.SF7.Value) Train:WriteTrainWire(9,W[8]*(1-self.CabActive)*C(Train.VRU.Value==1)*Train.SF7.Value)

16
lua/metrostroi/systems/sys_81_722_pneumatic.lua
View File

@@ -43,6 +43,8 @@ function TRAIN_SYSTEM:Initialize()
self.V4 = false --Включение РУ self.V4 = false --Включение РУ
self.ParkingBrake = -1
self.K1 = false self.K1 = false
self.K2 = false self.K2 = false
self.SD2 = 0 self.SD2 = 0
@@ -436,10 +438,18 @@ function TRAIN_SYSTEM:Think(dT)
else else
self:equalizePressure(dT,"BrakeCylinderPressure", 0.0, 2.00) self:equalizePressure(dT,"BrakeCylinderPressure", 0.0, 2.00)
end end
if Train.BUKV.ParkingBrake==0 then if Train:ReadTrainWire(11)*(1-Train:ReadTrainWire(31)) == 1 then
self:equalizePressure(dT,"ParkingBrakePressure", self.TrainLinePressure, 0.4,1,nil,0.5) self.ParkingBrake = 1
else elseif Train:ReadTrainWire(31)*(1-Train:ReadTrainWire(11)) == 1 then
self.ParkingBrake = 0
elseif Train:ReadTrainWire(11)+Train:ReadTrainWire(31) == 2 then
self.ParkingBrake = -1 --блокировка
end
if self.ParkingBrake == 1 then
self:equalizePressure(dT,"ParkingBrakePressure", 0, 0.4,1,nil,0.5) self:equalizePressure(dT,"ParkingBrakePressure", 0, 0.4,1,nil,0.5)
elseif self.ParkingBrake == 0 then
self:equalizePressure(dT,"ParkingBrakePressure", self.TrainLinePressure, 0.4,1,nil,0.5)
end end
Train:SetPackedRatio("ParkingBrakePressure_dPdT",self.ParkingBrakePressure_dPdT+0.02) Train:SetPackedRatio("ParkingBrakePressure_dPdT",self.ParkingBrakePressure_dPdT+0.02)
trainLineConsumption_dPdT = trainLineConsumption_dPdT + math.max(0,self.BrakeCylinderPressure_dPdT + self.ParkingBrakePressure_dPdT) trainLineConsumption_dPdT = trainLineConsumption_dPdT + math.max(0,self.BrakeCylinderPressure_dPdT + self.ParkingBrakePressure_dPdT)