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

Это для работы КРУ в 3 руки и для срабатывания А54 при постановке реверса вперед в обеих кабинах

Browse Source
This commit is contained in:
Moon Horse
2021-12-21 12:47:23 +03:00
parent 9556a43493
commit 9947789b6c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
if isMVM then if isMVM then
Train:WriteTrainWire(71,S["33D"]*Train.OtklBV.Value) Train:WriteTrainWire(71,S["33D"]*Train.OtklBV.Value)
end end
Train.RPvozvrat.VozRpPressed = T[17]~=0
--Вагонная часть --Вагонная часть
S["10A"] = BO*Train.A30.Value S["10A"] = BO*Train.A30.Value
S["ZR"] = (1-Train.RRP.Value)+(B*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1 S["ZR"] = (1-Train.RRP.Value)+(B*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1

7
lua/metrostroi/systems/sys_81_717_electric.lua
View File

@@ -88,7 +88,11 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
S["F7"] = S["F"]*KV["F-F7"]+S["14b"]*KRU["11/3-FR1"] S["F7"] = S["F"]*KV["F-F7"]+S["14b"]*KRU["11/3-FR1"]
Train:WriteTrainWire(5,S["10AK"]*KV["10AK-5"] + KRU["5/3-ZM31"]*-10) Train:WriteTrainWire(5,S["10AK"]*KV["10AK-5"] + KRU["5/3-ZM31"]*-10)
Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"] + --[[max(0,min(1,T[4])*KV["4-0"]*-10)]]KV["4-0"]*-10) Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]) --[[max(0,min(1,T[4])*KV["4-0"]*-10)KV["4-0"]*-10]]
if T[4]*KV["4-0"] ~= 0 then
Train.A54:TriggerInput("Set",0)
Train:WriteTrainWire(5,0)
end
--Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]*(1-T[4]*KV["4-0"]*-10)) --Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]*(1-T[4]*KV["4-0"]*-10))
Panel.LST = T[6]*Train.A40.Value Panel.LST = T[6]*Train.A40.Value
@@ -451,6 +455,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
Panel.L1 = T[57] Panel.L1 = T[57]
end end
Panel.M8 = S["V2"]*Train.PVK.Value Panel.M8 = S["V2"]*Train.PVK.Value
Train.RPvozvrat.VozRpPressed = T[17]~=0
local ASNP_VV = Train.ASNP_VV local ASNP_VV = Train.ASNP_VV
ASNP_VV.Power = BO*Train.AS1.Value*Train.R_ASNPOn.Value ASNP_VV.Power = BO*Train.AS1.Value*Train.R_ASNPOn.Value

7
lua/metrostroi/systems/sys_yar_13b.lua
View File

@@ -30,6 +30,7 @@ function TRAIN_SYSTEM:Initialize()
latched = true, -- RPvozvrat latches into place latched = true, -- RPvozvrat latches into place
power_open = "None", -- Power source for the open signal power_open = "None", -- Power source for the open signal
power_close = "Mechanical", -- Power source for the close signal power_close = "Mechanical", -- Power source for the close signal
VozRpPressed = false, -- Added to override the blocking action of the energized RP relays on RPVozvrat
}) })
-- Реле времени РВ1 -- Реле времени РВ1
@@ -93,13 +94,13 @@ function TRAIN_SYSTEM:Think()
end end
--self.RUTTarget = 250 + 150*self.Train.Pneumatic.WeightLoadRatio --self.RUTTarget = 250 + 150*self.Train.Pneumatic.WeightLoadRatio
-- RPvozvrat operation -- RPvozvrat operation
Train.RPvozvrat:TriggerInput("Close", Train.RPvozvrat:TriggerInput("Close", not Train.RPvozvrat.VozRpPressed and
(Train.DR1.Value == 1.0) or ((Train.DR1.Value == 1.0) or
(Train.DR2.Value == 1.0) or (Train.DR2.Value == 1.0) or
(Train.RPL.Value == 1.0) or (Train.RPL.Value == 1.0) or
(Train.RP1_3.Value == 1.0) or (Train.RP1_3.Value == 1.0) or
(Train.RP2_4.Value == 1.0) or (Train.RP2_4.Value == 1.0) or
(Train.RZ_1.Value == 1.0) or (Train.RZ_1.Value == 1.0) or
(Train.RZ_2.Value == 1.0) or (Train.RZ_2.Value == 1.0) or
(Train.RZ_3.Value == 1.0)) (Train.RZ_3.Value == 1.0)))
end end