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

-Откат PR434

Browse Source 
-Добавлено питание провода Д1 с 16ПП
-На 717СПб добавлена запитка 31ПП через дополнительную кнопку левых дверей
This commit is contained in:
alexandr_sizov
2022-01-16 10:10:36 +03:00
parent f569694527
commit e1b0dab2ee
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -717,11 +717,12 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
Panel.KUP = S["B9a"]*Train.KUP.Value Panel.KUP = S["B9a"]*Train.KUP.Value
S["D4"] = BO*Train.A13.Value S["D4"] = BO*Train.A13.Value
S["D1"] = T[10]*Train.A21.Value*KV["D-D1"]+S["14b"]*KRU["11/3-D1/1"]
if isLVZ then if isLVZ then
if isKSD then if isKSD then
S["D1"] = T[10]*Train.A21.Value*KV["D-D1"]+S["14b"]*KRU["11/3-D1/1"]+T[16]*Train.VUD1.Value
S[16] = S["D1"]*Train.VUD1.Value S[16] = S["D1"]*Train.VUD1.Value
else else
S["D1"] = T[10]*Train.A21.Value*KV["D-D1"]+S["14b"]*KRU["11/3-D1/1"]+T[16]*Train.VUD1.Value*Train.VUD2.Value
S[16] = S["D1"]*Train.VUD1.Value*Train.VUD2.Value S[16] = S["D1"]*Train.VUD1.Value*Train.VUD2.Value
end end
Train:WriteTrainWire(16,S[16]+AVO["16"]*RC2) Train:WriteTrainWire(16,S[16]+AVO["16"]*RC2)
@@ -735,10 +736,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
S["D16"] = Train.VUD1.Value*Train.VUD2.Value S["D1"] = T[10]*Train.A21.Value*KV["D-D1"]+S["14b"]*KRU["11/3-D1/1"]+T[16]*Train.VUD1.Value*Train.VUD2.Value
S[31] = (S["D1"]+T[16]*S["D16"])*(1-Train.DoorSelect.Value) S[31] = (S["D1"])*(1-Train.DoorSelect.Value)
S[32] = (S["D1"]+T[16]*S["D16"])*Train.DoorSelect.Value S[32] = (S["D1"])*Train.DoorSelect.Value
Train:WriteTrainWire(16,S["D1"]*S["D16"]) Train:WriteTrainWire(16,S["D1"]*Train.VUD1.Value*Train.VUD2.Value)
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]
@@ -747,11 +748,7 @@ 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
if isKSD then Train:WriteTrainWire(31,S[31]*((Train.KDL.Value+Train.KDLR.Value)*(1-RC2))+(S["D1"])*Train.VDL.Value+AVO["31"]*RC2 + S["12A"]*Train.A31.Value)
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)