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

fix

Browse Source
This commit is contained in:
Hellss
2021-11-08 23:40:49 +03:00
parent 107ad16ffc
commit b3e1513ebf
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lua/metrostroi/systems/sys_81_722_bukp.lua
View File

@@ -382,7 +382,6 @@ function TRAIN_SYSTEM:Think(dT)
self:CState("CloseDoors",RR and Train.SF7.Value>0 and (Train.DoorClose.Value == 0 or (not self.CloseRing and Train.DoorClose.Value==2 or self.CloseRing and CurTime()-self.CloseRing>4))) self:CState("CloseDoors",RR and Train.SF7.Value>0 and (Train.DoorClose.Value == 0 or (not self.CloseRing and Train.DoorClose.Value==2 or self.CloseRing and CurTime()-self.CloseRing>4)))
self:CState("PassLight",Train.PassLight.Value>0) self:CState("PassLight",Train.PassLight.Value>0)
self:CState("PassVent",Train.PassVent.Value-1) self:CState("PassVent",Train.PassVent.Value-1)
self:CState("ParkingBrake",Train.ParkingBrake.Value)
if BARSPower and Train.BARS.V2 > 0 or not BARSPower and math.abs(self.Speed) < 0.5 and self.PowerCommand < 0 then if BARSPower and Train.BARS.V2 > 0 or not BARSPower and math.abs(self.Speed) < 0.5 and self.PowerCommand < 0 then
self.StopV2 = true self.StopV2 = true
elseif self.PowerCommand > 0 then elseif self.PowerCommand > 0 then

1
lua/metrostroi/systems/sys_81_722_bukv.lua
View File

@@ -276,7 +276,6 @@ function TRAIN_SYSTEM:Think()
self.EnableMK = (not self:Get("PVU4") and self:Get("Compressor")) and 1 or 0 self.EnableMK = (not self:Get("PVU4") and self:Get("Compressor")) and 1 or 0
self.DisableTP = (self:Get("PVU5") or self:Get("PVU6")) and 1 or 0 self.DisableTP = (self:Get("PVU5") or self:Get("PVU6")) and 1 or 0
self.DisablePant = (self:Get("DisablePant") or self:Get("PVU7")) and 1 or 0 self.DisablePant = (self:Get("DisablePant") or self:Get("PVU7")) and 1 or 0
self.ParkingBrake = self:Get("ParkingBrake")
local vent = self:Get("PassVent") or 0 local vent = self:Get("PassVent") or 0
if vent==1 then if vent==1 then
self.VentMode = Train.Pneumatic.WeightLoadRatio>0.6 and 2 or Train.Pneumatic.WeightLoadRatio>0.1 and 1 or 0 self.VentMode = Train.Pneumatic.WeightLoadRatio>0.6 and 2 or Train.Pneumatic.WeightLoadRatio>0.1 and 1 or 0

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

@@ -43,8 +43,6 @@ 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
@@ -438,17 +436,10 @@ 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:ReadTrainWire(11)*(1-Train:ReadTrainWire(31)) == 1 then local w11, w31 = Train:ReadTrainWire(11), Train:ReadTrainWire(31)
self.ParkingBrake = 1 if w11*(1-w31) > 0 then
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 elseif w31*(1-w11) > 0 then
self:equalizePressure(dT,"ParkingBrakePressure", self.TrainLinePressure, 0.4,1,nil,0.5) 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)