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

Several pneumatic coeffs corrections

Browse Source
This commit is contained in:
Moon Horse
2024-12-21 19:50:31 +03:00
parent 633a65c806
commit 2071305739
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lua/metrostroi/systems/sys_81_714_pneumatic.lua
View File

@@ -33,7 +33,7 @@ function TRAIN_SYSTEM:Initialize(parameters)
-- Pressure in trains feed line -- Pressure in trains feed line
self.TrainLinePressure = 8.0 -- atm self.TrainLinePressure = 8.0 -- atm
-- Pressure in trains brake line -- Pressure in trains brake line
self.BrakeLinePressure = 0.0 -- atm self.BrakeLinePressure = 3.0 -- atm
-- Pressure in brake cylinder -- Pressure in brake cylinder
self.BrakeCylinderPressure = 0.0 -- atm self.BrakeCylinderPressure = 0.0 -- atm
self.OldBrakeLinePressure = 0.0 self.OldBrakeLinePressure = 0.0
@@ -42,11 +42,11 @@ function TRAIN_SYSTEM:Initialize(parameters)
self.OldBrakeLinePressure = 0.0 self.OldBrakeLinePressure = 0.0
self.BCPressure = 0 self.BCPressure = 0
-- Air distrubutor part -- Air distrubutor part
self.WorkingChamberPressure = 0.0 self.WorkingChamberPressure = 5.2
-- Disconnected KM 334 vessels (trainline and brakeline parts between disconnect valve and KM itself) emulation -- Disconnected KM 334 vessels (trainline and brakeline parts between disconnect valve and KM itself) emulation
self.TLDisconnectPressure = 0.0 self.TLDisconnectPressure = 0.0
self.BLDisconnectPressure = 0.0 self.BLDisconnectPressure = 0.0
self.WCChargeValve = true self.WCChargeValve = false
self.PN1 = 0 self.PN1 = 0
self.PN2 = 0 self.PN2 = 0
self.cranPres = 0 self.cranPres = 0
@@ -425,32 +425,32 @@ function TRAIN_SYSTEM:Think(dT)
end end
-- 013: 2 Normal pressure -- 013: 2 Normal pressure
if (self.RealDriverValvePosition == 2) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure)) then--was pr_speed*2 if (self.RealDriverValvePosition == 2) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(self.KM013offset,self.TrainToBrakeReducedPressure)) then--was pr_speed*2
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(self.KM013offset+(self.km13_error2 or 0),self.TrainLinePressure), pr_speed, pz_speed, nil, 2.5)-- nil, 1.0) self:equalizePressure(dT,"BrakeLinePressure", math.min(self.KM013offset+(self.km13_error2 or 0),self.TrainLinePressure), pr_speed, pz_speed, nil, 2.5)-- nil, 1.0)
if self.km13_error2 and self.BrakeLinePressure >= self.KM013offset+self.km13_error2-0.1 then if self.km13_error2 and self.BrakeLinePressure >= self.KM013offset+self.km13_error2-0.1 then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure), 35, pz_speed, nil, 1) self:equalizePressure(dT,"BrakeLinePressure", math.min(self.KM013offset,self.TrainToBrakeReducedPressure), 35, pz_speed, nil, 1)
self.km13_error2 = nil self.km13_error2 = nil
end end
end end
-- 013: 3 4.3 Atm -- 013: 3 4.3 Atm
if (self.RealDriverValvePosition == 3) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(4.3,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 3) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(4.3,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(4.3,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(4.3,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 4 4.0 Atm -- 013: 4 4.0 Atm
if (self.RealDriverValvePosition == 4) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(4.0,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 4) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(4.0,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(4.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(4.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 5 3.7 Atm -- 013: 5 3.7 Atm
if (self.RealDriverValvePosition == 5) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(3.7,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 5) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(3.7,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(3.7,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(3.7,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 6 3.0 Atm -- 013: 6 3.0 Atm
if (self.RealDriverValvePosition == 6) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(3.0,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 6) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(3.0,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(3.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(3.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 7 0.0 Atm -- 013: 7 0.0 Atm

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

@@ -34,7 +34,7 @@ function TRAIN_SYSTEM:Initialize(parameters)
-- Pressure in trains feed line -- Pressure in trains feed line
self.TrainLinePressure = 8.0 -- atm self.TrainLinePressure = 8.0 -- atm
-- Pressure in trains brake line -- Pressure in trains brake line
self.BrakeLinePressure = 0.0 -- atm self.BrakeLinePressure = 3.0 -- atm
self.EPKPressure = 0.0 -- atm self.EPKPressure = 0.0 -- atm
-- Pressure in brake cylinder -- Pressure in brake cylinder
self.BrakeCylinderPressure = 0.0 -- atm self.BrakeCylinderPressure = 0.0 -- atm
@@ -44,11 +44,11 @@ function TRAIN_SYSTEM:Initialize(parameters)
self.OldBrakeLinePressure = 0.0 self.OldBrakeLinePressure = 0.0
self.BCPressure = 0 self.BCPressure = 0
-- Air distrubutor part -- Air distrubutor part
self.WorkingChamberPressure = 0.0 self.WorkingChamberPressure = 5.2
-- Disconnected KM 334 vessels (trainline and brakeline parts between disconnect valve and KM itself) emulation -- Disconnected KM 334 vessels (trainline and brakeline parts between disconnect valve and KM itself) emulation
self.TLDisconnectPressure = 0.0 self.TLDisconnectPressure = 0.0
self.BLDisconnectPressure = 0.0 self.BLDisconnectPressure = 0.0
self.WCChargeValve = true self.WCChargeValve = false
self.PN1 = 0 self.PN1 = 0
self.PN2 = 0 self.PN2 = 0
self.cranPres = 0 self.cranPres = 0
@@ -479,32 +479,32 @@ function TRAIN_SYSTEM:Think(dT)
end end
-- 013: 2 Normal pressure -- 013: 2 Normal pressure
if (self.RealDriverValvePosition == 2) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure)) then--was pr_speed*2 if (self.RealDriverValvePosition == 2) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(self.KM013offset,self.TrainToBrakeReducedPressure)) then--was pr_speed*2
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(self.KM013offset+(self.km13_error2 or 0),self.TrainLinePressure), pr_speed, pz_speed, nil, 2.5)-- nil, 1.0) self:equalizePressure(dT,"BrakeLinePressure", math.min(self.KM013offset+(self.km13_error2 or 0),self.TrainLinePressure), pr_speed, pz_speed, nil, 2.5)-- nil, 1.0)
if self.km13_error2 and self.BrakeLinePressure >= self.KM013offset+self.km13_error2-0.1 then if self.km13_error2 and self.BrakeLinePressure >= self.KM013offset+self.km13_error2-0.1 then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(self.KM013offset,self.TrainToBrakeReducedPressure), 35, pz_speed, nil, 1) self:equalizePressure(dT,"BrakeLinePressure", math.min(self.KM013offset,self.TrainToBrakeReducedPressure), 35, pz_speed, nil, 1)
self.km13_error2 = nil self.km13_error2 = nil
end end
end end
-- 013: 3 4.3 Atm -- 013: 3 4.3 Atm
if (self.RealDriverValvePosition == 3) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(4.3,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 3) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(4.3,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(4.3,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(4.3,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 4 4.0 Atm -- 013: 4 4.0 Atm
if (self.RealDriverValvePosition == 4) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(4.0,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 4) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(4.0,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(4.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(4.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 5 3.7 Atm -- 013: 5 3.7 Atm
if (self.RealDriverValvePosition == 5) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(3.7,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 5) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(3.7,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(3.7,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(3.7,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 6 3.0 Atm -- 013: 6 3.0 Atm
if (self.RealDriverValvePosition == 6) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > 1.01*math.min(3.0,self.TrainToBrakeReducedPressure)) then if (self.RealDriverValvePosition == 6) and self.BLDisconnect and (self.TLDisconnect or self.BrakeLinePressure > math.min(3.0,self.TrainToBrakeReducedPressure)) then
self:equalizePressure(dT,"BrakeLinePressure", 1.01*math.min(3.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5) self:equalizePressure(dT,"BrakeLinePressure", math.min(3.0,self.TrainToBrakeReducedPressure), pr_speed,pz_speed, nil, 2.5)
end end
-- 013: 7 0.0 Atm -- 013: 7 0.0 Atm