mirror of
https://github.com/metrostroi-repo/MetrostroiAddon.git
synced 2026-05-02 00:42:29 +00:00
release branch init
This commit is contained in:
@@ -62,6 +62,7 @@ function TRAIN_SYSTEM:Initialize(parameters)
|
||||
self.Train:LoadSystem("AirDistributorDisconnect","Relay","Switch")
|
||||
--УАВА
|
||||
self.Train:LoadSystem("UAVA","Relay","Switch",{ bass = true})
|
||||
self.Train:LoadSystem("UAVAContact","Relay","Switch")
|
||||
self.Train:LoadSystem("UAVAC","Relay","",{normally_closed=true,bass=true})
|
||||
-- Isolation valves
|
||||
self.Train:LoadSystem("FrontBrakeLineIsolation","Relay","Switch", { normally_closed = true, bass = true})
|
||||
@@ -89,8 +90,6 @@ function TRAIN_SYSTEM:Initialize(parameters)
|
||||
self.RightDoorDir = { 0,0,0,0 }
|
||||
self.LeftDoorSpeed = {0,0,0,0}
|
||||
self.RightDoorSpeed = {0,0,0,0}
|
||||
self.LeftDoorStuck = {false, false, false, false}
|
||||
self.RightDoorStuck = {false, false, false, false}
|
||||
local start = math.Rand(0.6,0.8)
|
||||
-- 0.6-1
|
||||
self.DoorSpeedMain = -math.Rand(start,math.Rand(start+0.1,start+0.2))
|
||||
@@ -358,12 +357,6 @@ function TRAIN_SYSTEM:Think(dT)
|
||||
if (Train.UAVA.Blocked>0) ~= UAVABlocked then
|
||||
Train.UAVA:TriggerInput("Block",UAVABlocked and 1 or 0)
|
||||
end
|
||||
|
||||
local UAVACBlocked = self.EmergencyValve and not self.EmergencyValveDisable
|
||||
if (Train.UAVAC.Blocked>0) ~= UAVACBlocked then
|
||||
Train.UAVAC:TriggerInput("Block",UAVACBlocked and 1 or 0)
|
||||
end
|
||||
|
||||
Train:SetPackedRatio("EmergencyValve_dPdT", -leak/wagc)
|
||||
|
||||
local leak = 0
|
||||
@@ -444,6 +437,12 @@ function TRAIN_SYSTEM:Think(dT)
|
||||
self.BePN2 = nil
|
||||
Train:PlayOnce("PN2end","stop")
|
||||
end
|
||||
|
||||
if Train.UAVAContact.Value > 0.5 and Train.UAVAC.Value < 0.5 then
|
||||
Train.UAVAC:TriggerInput("Set",1)
|
||||
Train:PlayOnce("uava_reset","bass",1)
|
||||
end
|
||||
|
||||
-- Simulate cross-feed between different wagons
|
||||
self:UpdatePressures(Train,dT)
|
||||
|
||||
@@ -510,18 +509,6 @@ function TRAIN_SYSTEM:Think(dT)
|
||||
self.VDZ = Train.VDZ.Value
|
||||
self:equalizePressure(dT,"TrainLinePressure", 0.0, 0.3)
|
||||
end
|
||||
if Train.CanStuckPassengerLeft then
|
||||
for i in ipairs(self.LeftDoorStuck) do
|
||||
self.LeftDoorStuck[i] = math.random() < (0.6+math.min(2,2-self.LeftDoorSpeed[i])*0.2)*Train.CanStuckPassengerLeft*0.6 and (math.random() > 0.7 and CurTime()+math.random()*15)
|
||||
end
|
||||
Train.CanStuckPassengerLeft = false
|
||||
end
|
||||
if Train.CanStuckPassengerRight then
|
||||
for i in ipairs(self.RightDoorStuck) do
|
||||
self.RightDoorStuck[i] = math.random() < (0.6+math.min(2,2-self.LeftDoorSpeed[i])*0.2)*Train.CanStuckPassengerRight*0.6 and (math.random() > 0.7 and CurTime()+math.random()*15)
|
||||
end
|
||||
Train.CanStuckPassengerRight = false
|
||||
end
|
||||
|
||||
|
||||
Train.LeftDoorsOpen = false
|
||||
@@ -531,9 +518,9 @@ function TRAIN_SYSTEM:Think(dT)
|
||||
for i=1,4 do
|
||||
self.LeftDoorDir[i] = math.Clamp(self.LeftDoorDir[i]+dT/(self.DoorLeft and self.LeftDoorSpeed[i] or -self.LeftDoorSpeed[i]),-1,1)
|
||||
self.RightDoorDir[i] = math.Clamp(self.RightDoorDir[i]+dT/(self.DoorRight and self.RightDoorSpeed[i] or -self.RightDoorSpeed[i]),-1,1)
|
||||
self.LeftDoorState[i] = math.Clamp(self.LeftDoorState[i] + ((self.LeftDoorDir[i]/self.LeftDoorSpeed[i])*dT),self.LeftDoorStuck[i] and 0.3 or 0,1)
|
||||
self.LeftDoorState[i] = math.Clamp(self.LeftDoorState[i] + ((self.LeftDoorDir[i]/self.LeftDoorSpeed[i])*dT),0,1)
|
||||
if self.LeftDoorState[i] == 0 or self.LeftDoorState[i] == 1 then self.LeftDoorDir[i] = 0 end
|
||||
self.RightDoorState[i] = math.Clamp(self.RightDoorState[i] + ((self.RightDoorDir[i]/self.RightDoorSpeed[i])*dT),self.RightDoorStuck[i] and 0.3 or 0,1)
|
||||
self.RightDoorState[i] = math.Clamp(self.RightDoorState[i] + ((self.RightDoorDir[i]/self.RightDoorSpeed[i])*dT),0,1)
|
||||
if self.RightDoorState[i] == 0 or self.RightDoorState[i] == 1 then self.RightDoorDir[i] = 0 end
|
||||
if not Train.LeftDoorsOpen and self.LeftDoorState[i] > 0 then
|
||||
Train.LeftDoorsOpen = true
|
||||
@@ -547,14 +534,6 @@ function TRAIN_SYSTEM:Think(dT)
|
||||
end
|
||||
Train:SetPackedRatio("DoorL"..i,self.LeftDoorState[i])
|
||||
Train:SetPackedRatio("DoorR"..i,self.RightDoorState[i])
|
||||
if self.LeftDoorStuck[i] and (self.DoorLeft or type(self.LeftDoorStuck[i]) == "number" and CurTime()-self.LeftDoorStuck[i] > 0) then
|
||||
self.LeftDoorStuck[i] = false
|
||||
end
|
||||
if self.RightDoorStuck[i] and (self.DoorRight or type(self.RightDoorStuck[i]) == "number" and CurTime()-self.RightDoorStuck[i] > 0) then
|
||||
self.RightDoorStuck[i] = false
|
||||
end
|
||||
Train:SetPackedBool("DoorLS"..i,self.LeftDoorStuck[i])
|
||||
Train:SetPackedBool("DoorRS"..i,self.RightDoorStuck[i])
|
||||
end
|
||||
if openL and not self.OpenWaitL then self.OpenWaitL = CurTime() end
|
||||
if openR and not self.OpenWaitR then self.OpenWaitR = CurTime() end
|
||||
|
||||
Reference in New Issue
Block a user