diff --git a/lua/entities/gmod_subway_ezh3/shared.lua b/lua/entities/gmod_subway_ezh3/shared.lua index fb52665..0cd1551 100644 --- a/lua/entities/gmod_subway_ezh3/shared.lua +++ b/lua/entities/gmod_subway_ezh3/shared.lua @@ -733,11 +733,11 @@ ENT.Spawner = { ent.RRIEnable:TriggerInput("Set",val<=1 and 1 or 0) ent.RRIAmplifier:TriggerInput("Set",val<=1 and 1 or 0) ent.R_ASNPOn:TriggerInput("Set",val<=2 and 1 or 0) - ent.R_UNch:TriggerInput("Set",val<=1 and 1 or 0) - ent.R_Radio:TriggerInput("Set",val<=1 and 1 or 0) - ent.R_G:TriggerInput("Set",val<=1 and 1 or 0) - ent.R_ZS:TriggerInput("Set",val<=1 and 1 or 0) - ent.RST:TriggerInput("Set",val<=1 and 1 or 0) + ent.R_UNch:TriggerInput("Set",(val<=1 and first) and 1 or 0) + ent.R_Radio:TriggerInput("Set",(val<=1 and first) and 1 or 0) + ent.R_G:TriggerInput("Set",(val<=1 and first) and 1 or 0) + ent.R_ZS:TriggerInput("Set",(val<=1 and first) and 1 or 0) + ent.RST:TriggerInput("Set",(val<=1 and first) and 1 or 0) ent.V1:TriggerInput("Set",(val==1 and first) and 1 or 0) _LastSpawner=CurTime() ent.CabinDoor = val==4 and first diff --git a/lua/metrostroi/systems/sys_81_710_electric.lua b/lua/metrostroi/systems/sys_81_710_electric.lua index b87cdd6..831e75d 100644 --- a/lua/metrostroi/systems/sys_81_710_electric.lua +++ b/lua/metrostroi/systems/sys_81_710_electric.lua @@ -89,7 +89,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) --RRI_VV.CabinSpeakerPower = T[13] else local ASNP_VV = Train.ASNP_VV - ASNP_VV.Power = BO*Train.R_ASNPOn.Value*Train.R_Radio.Value*Train.PRL4A.Value + ASNP_VV.Power = BO*Train.R_ASNPOn.Value*Train.RST.Value*Train.PRL4A.Value ASNP_VV.AmplifierPower = ASNP_VV.Power*Train.ASNP.LineOut*Train.R_UNch.Value ASNP_VV.CabinSpeakerPower = ASNP_VV.Power*Train.ASNP.LineOut*Train.R_G.Value Train:WriteTrainWire(13,ASNP_VV.AmplifierPower)