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

Merge pull request #434 from metrostroi-repo/#358

Browse Source 
Запитка кнопок дверей #358
This commit is contained in:
HellReach
2022-01-13 16:43:24 +03:00
committed by GitHub
parent 039f7f49bb 02820581d3
commit d06af6287a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -735,9 +735,10 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
S[31] = S[31]*(1-Train.VUD1.Value) S[31] = S[31]*(1-Train.VUD1.Value)
S[32] = S[32]*(1-Train.VUD1.Value) S[32] = S[32]*(1-Train.VUD1.Value)
else else
Train:WriteTrainWire(16,S["D1"]*(Train.VUD1.Value*Train.VUD2.Value)) S["D16"] = Train.VUD1.Value*Train.VUD2.Value
S[31] = S["D1"]*(1-Train.DoorSelect.Value) S[31] = (S["D1"]+T[16]*S["D16"])*(1-Train.DoorSelect.Value)
S[32] = S["D1"]*Train.DoorSelect.Value S[32] = (S["D1"]+T[16]*S["D16"])*Train.DoorSelect.Value
Train:WriteTrainWire(16,S["D1"]*S["D16"])
end end
Train:WriteTrainWire(12,S["D1"]*Train.KRZD.Value) Train:WriteTrainWire(12,S["D1"]*Train.KRZD.Value)
Panel.DoorsLeft = S[31] Panel.DoorsLeft = S[31]
@@ -746,7 +747,11 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
S["12A"] = T[12]*Train.A12.Value S["12A"] = T[12]*Train.A12.Value
if isLVZ then if isLVZ then
if isPA then AVI.ZD = S[16] end if isPA then AVI.ZD = S[16] end
Train:WriteTrainWire(31,S[31]*(Train.KDL.Value*(1-RC2))+S["D1"]*Train.VDL.Value+AVO["31"]*RC2 + S["12A"]*Train.A31.Value) if isKSD then
Train:WriteTrainWire(31,S[31]*(Train.KDL.Value*(1-RC2))+(S["D1"]+T[16]*Train.VUD1.Value)*Train.VDL.Value+AVO["31"]*RC2 + S["12A"]*Train.A31.Value)
else
Train:WriteTrainWire(31,S[31]*(Train.KDL.Value*(1-RC2))+(S["D1"]+T[16]*Train.VUD1.Value*Train.VUD2.Value)*Train.VDL.Value+AVO["31"]*RC2 + S["12A"]*Train.A31.Value)
end
Train:WriteTrainWire(32,S[32]*(Train.KDP.Value)*(1-RC2)+AVO["32"]*RC2 + S["12A"]*Train.A32.Value) Train:WriteTrainWire(32,S[32]*(Train.KDP.Value)*(1-RC2)+AVO["32"]*RC2 + S["12A"]*Train.A32.Value)
elseif not isDot2 then elseif not isDot2 then
Train:WriteTrainWire(31,S[31]*(Train.KDL.Value+Train.KDLR.Value+Train.VDL.Value)*(Train.ASNP.K1+(1-Train.VBD.Value)) + S["12A"]*Train.A31.Value) Train:WriteTrainWire(31,S[31]*(Train.KDL.Value+Train.KDLR.Value+Train.VDL.Value)*(Train.ASNP.K1+(1-Train.VBD.Value)) + S["12A"]*Train.A31.Value)