From 8f7eb989f0cb9941e111efd80ee9f5d83558d017 Mon Sep 17 00:00:00 2001 From: Anton Shukin Date: Sun, 11 Feb 2024 05:24:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=BE=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=81=D0=BF=D0=B0?= =?UTF-8?q?=D0=B2=D0=BD=D0=B0,=20=D0=90=D0=A1=D0=9D=D0=9F=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D0=B8=D1=82=D0=B0=D0=BD=D0=B0=20=D0=BE=D1=82=20=D0=92?= =?UTF-8?q?=D0=9F=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/entities/gmod_subway_ezh3/shared.lua | 10 +++++----- lua/metrostroi/systems/sys_81_710_electric.lua | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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)