From 8bac9172b3b099e2ec0847de0f000e71723aa544 Mon Sep 17 00:00:00 2001 From: alexandr_sizov Date: Sat, 18 Dec 2021 12:40:05 +0300 Subject: [PATCH 1/2] Fixed IGLS power --- lua/metrostroi/systems/sys_81_717_electric.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lua/metrostroi/systems/sys_81_717_electric.lua b/lua/metrostroi/systems/sys_81_717_electric.lua index 7f0eafb..7f2d09c 100644 --- a/lua/metrostroi/systems/sys_81_717_electric.lua +++ b/lua/metrostroi/systems/sys_81_717_electric.lua @@ -159,7 +159,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) ARS.NGPower = S["7D"]*RC1 Train.BIS200.Power = T[10]*Train.A43.Value*(Train.ALS.Value+Train.ARS.Value) ARS.KB=T[91]*RC1+(ARS.ALS*(1-Train.BSM_GE.Value)+ARS.GE*Train.BSM_GE.Value)*Train.KVT.Value ---]] + --]] S["14bx"] = S["14b"]*Train.KRP.Value S["KRH"] = max(0,T[1])+S["14bx"] ARS.KRH = S["KRH"]*RC1 @@ -462,8 +462,8 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.AnnouncerPlaying = T[13] Panel.AnnouncerBuzz = T[-13]+ASNP_VV.CabinSpeakerPower*Train.PowerSupply.X2_2 Train:WriteTrainWire(14,S["14a"]*(Train.SOT.Value+Train.UOS.Value)*Train.KRP.Value*Train.ROT2.Value) - - Panel.CBKIPower = BO*Train.A76.Value + Panel.PCBKPower = BO + Panel.CBKIPower = Panel.PCBKPower end if self.OldFLARS then Panel.LUDS = ARS.FMM1*Train.AIS.Value @@ -615,7 +615,6 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) end if isMVM then Train.BV:TriggerInput("Disable",T[71]*Train.A66.Value) - Panel.PCBKPower = T[10] end Train.RPvozvrat:TriggerInput("Open",S["17A"]) --FIXME Mayve more right RP code -- @@ -851,7 +850,6 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.VPR = BO*Train.AR63.Value*Train.R_VPR.Value+B*Train.AV3.Value*Train.R_VPR.Value else Panel.VPR = BO*Train.AR63.Value*Train.R_VPR.Value - Panel.PCBKPower = BO end --BPSN From ec81a65f5fc68b0659995af4e6fab3d2f2542ba2 Mon Sep 17 00:00:00 2001 From: alexandr_sizov Date: Sat, 18 Dec 2021 12:40:34 +0300 Subject: [PATCH 2/2] Fixed ASNP power --- lua/metrostroi/systems/sys_81_717_electric.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/metrostroi/systems/sys_81_717_electric.lua b/lua/metrostroi/systems/sys_81_717_electric.lua index 7f2d09c..b7243e1 100644 --- a/lua/metrostroi/systems/sys_81_717_electric.lua +++ b/lua/metrostroi/systems/sys_81_717_electric.lua @@ -453,7 +453,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.M8 = S["V2"]*Train.PVK.Value local ASNP_VV = Train.ASNP_VV - ASNP_VV.Power = BO*Train.AS1.Value*Train.R_ASNPOn.Value + ASNP_VV.Power = T[10]*Train.R_ASNPOn.Value ASNP_VV.AmplifierPower = ASNP_VV.Power*Train.ASNP.LineOut*Train.R_UNch.Value*Train.A26.Value Train:WriteTrainWire(13,ASNP_VV.AmplifierPower) Train:WriteTrainWire(-13,ASNP_VV.AmplifierPower*Train.PowerSupply.X2_2)