From 61d42fee9ea1c24e16074aacb8edca6a02b38263 Mon Sep 17 00:00:00 2001 From: Ilya Krasnow Date: Mon, 20 Dec 2021 14:02:29 +0300 Subject: [PATCH 1/3] Update cl_init.lua --- lua/entities/gmod_subway_81-703_int/cl_init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/entities/gmod_subway_81-703_int/cl_init.lua b/lua/entities/gmod_subway_81-703_int/cl_init.lua index 5983d35..c1b7cc3 100644 --- a/lua/entities/gmod_subway_81-703_int/cl_init.lua +++ b/lua/entities/gmod_subway_81-703_int/cl_init.lua @@ -1149,7 +1149,7 @@ function ENT:Think() self:ShowHideSmooth("bortlamp2_y",em and 1 or 0) end if em then - local Bortlamp_w = em and self:Animate("Bortlamp_w",self:GetPackedBool("SD") and 1 or 0,0,1,16,false) or 0 + local Bortlamp_w = em and self:Animate("Bortlamp_w",self:GetPackedBool("SD") and 0 or 1,0,1,16,false) or 0 local Bortlamp_g = em and self:Animate("Bortlamp_g",self:GetPackedBool("GRP") and 1 or 0,0,1,16,false) or 0 local Bortlamp_y = em and self:Animate("Bortlamp_y",self:GetPackedBool("BrY") and 1 or 0,0,1,16,false) or 0 self:ShowHide("bortlamps1",em) @@ -1269,7 +1269,7 @@ function ENT:Think() else self.DoorLoopStates[id] = math.Clamp((self.DoorLoopStates[id] or 0) - 6*self.DeltaTime,0,1) end - self:SetSoundState(sid.."r",self.DoorLoopStates[id],0.66+self.DoorLoopStates[id]*0.2) + self:SetSoundState(sid.."r",self.DoorLoopStates[id],0.5+self.DoorLoopStates[id]*0.2) local n_l = "door"..i.."x"..k--.."a" --local n_r = "door"..i.."x"..k.."b" local dlo = 1 @@ -1280,7 +1280,7 @@ function ENT:Think() dlo = self.Anims[n_l].oldspeed/14 end end - self:Animate(n_l,state,0,1, dlo*14,false)--0.8 + (-0.2+0.4*math.random()),0) + self:Animate(n_l,state,0.01,1, dlo*14,false)--0.8 + (-0.2+0.4*math.random()),0) --self:Animate(n_r,state,0,1, dlo*14,false)--0.8 + (-0.2+0.4*math.random()),0) end end From e8653ab74b2d71b46411333246861059828aa8a1 Mon Sep 17 00:00:00 2001 From: Ilya Krasnow Date: Tue, 28 Dec 2021 19:02:18 +0300 Subject: [PATCH 2/3] Update cl_init.lua --- lua/entities/gmod_subway_81-703_int/cl_init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/entities/gmod_subway_81-703_int/cl_init.lua b/lua/entities/gmod_subway_81-703_int/cl_init.lua index c1b7cc3..e5d11d5 100644 --- a/lua/entities/gmod_subway_81-703_int/cl_init.lua +++ b/lua/entities/gmod_subway_81-703_int/cl_init.lua @@ -1149,7 +1149,7 @@ function ENT:Think() self:ShowHideSmooth("bortlamp2_y",em and 1 or 0) end if em then - local Bortlamp_w = em and self:Animate("Bortlamp_w",self:GetPackedBool("SD") and 0 or 1,0,1,16,false) or 0 + local Bortlamp_w = em and self:Animate("Bortlamp_w",self:GetPackedBool("SD") and 1 or 0,0,1,16,false) or 0 local Bortlamp_g = em and self:Animate("Bortlamp_g",self:GetPackedBool("GRP") and 1 or 0,0,1,16,false) or 0 local Bortlamp_y = em and self:Animate("Bortlamp_y",self:GetPackedBool("BrY") and 1 or 0,0,1,16,false) or 0 self:ShowHide("bortlamps1",em) From cf668b6ee4e5821d067351ac4daad9f38c3e9f0c Mon Sep 17 00:00:00 2001 From: alexandr_sizov Date: Tue, 28 Dec 2021 21:12:20 +0300 Subject: [PATCH 3/3] Fixed white bort lamp on E in KVL mode --- lua/metrostroi/systems/sys_81_703i_electric.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/metrostroi/systems/sys_81_703i_electric.lua b/lua/metrostroi/systems/sys_81_703i_electric.lua index 069aa0f..be3b8c1 100644 --- a/lua/metrostroi/systems/sys_81_703i_electric.lua +++ b/lua/metrostroi/systems/sys_81_703i_electric.lua @@ -335,8 +335,8 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train) local BD = 1-Train.BD.Value if isKVL then Train:WriteTrainWire(15,T[-15]*Train.RD.Value) - Panel.SD = T[-15]*T[15] Train.RD:TriggerInput("Set",BO*Train.BD.Value) + Panel.SD = BO*BD else Train:WriteTrainWire(15,BD*(1-Train.KU11.Value)) Panel.SD = (S["D1"]+BO*Train.KU11.Value)*(T[15]*(1-Train.KU11.Value)+BD)