diff --git a/lua/entities/gmod_subway_ezh3/cl_init.lua b/lua/entities/gmod_subway_ezh3/cl_init.lua index 3883ed8..5097dcd 100644 --- a/lua/entities/gmod_subway_ezh3/cl_init.lua +++ b/lua/entities/gmod_subway_ezh3/cl_init.lua @@ -180,9 +180,9 @@ ENT.ButtonMap["Main"] = { var="KB",speed=16,vmin=1,vmax=0, sndvol = 0.10, snd = function(val) return val and "button3_on" or "button2_off" end,sndmin = 60, sndmax = 1e3/3, sndang = Angle(-90,0,0), }}, - {ID = "RKLamp", x=292, y=61+1, radius=20, tooltip="", model = { + {ID = "!LKVT", x=292, y=61+1, radius=20, tooltip="", model = { model = "models/metrostroi_train/81-710/ezh3_kblamp.mdl", skin = 2, z = 5,-- color = Color(60,255,255), - lamp = {model = "models/metrostroi_train/81-710/ezh3_kblamp2.mdl",z = 5-4,color = Color(255,150,150), var="LRK", + lamp = {model = "models/metrostroi_train/81-710/ezh3_kblamp2.mdl",z = 5-4,color = Color(255,150,150), var="LKVT", lcolor=Color(255,50,20),lz = 20,lbright=2,lfov=130,lfar=16,lnear=8,lshadows=0}, sprite = {bright=0.4,size=0.25,scale=0.07,color=Color(255,50,20),z=6} }}, diff --git a/lua/entities/gmod_subway_ezh3/init.lua b/lua/entities/gmod_subway_ezh3/init.lua index e1d941d..f2a8461 100644 --- a/lua/entities/gmod_subway_ezh3/init.lua +++ b/lua/entities/gmod_subway_ezh3/init.lua @@ -303,7 +303,7 @@ function ENT:Think() self.TrueBrakeAngle = self.TrueBrakeAngle + (self.ManualBrake - self.TrueBrakeAngle)*2.0*(self.DeltaTime or 0) self:SetPackedRatio("ManualBrake",self.TrueBrakeAngle) - self:SetPackedBool("LRK",Panel.Sequence > 0) + self:SetPackedBool("LKVT",Panel.LKVT > 0) self:SetPackedBool("KT",Panel.KT > 0) self:SetPackedBool("AVU",Panel.AVU > 0.5) self:SetPackedBool("RingEnabled",Panel.Ring > 0.5) diff --git a/lua/metrostroi/systems/sys_81_710_electric.lua b/lua/metrostroi/systems/sys_81_710_electric.lua index 8507937..3a49084 100644 --- a/lua/metrostroi/systems/sys_81_710_electric.lua +++ b/lua/metrostroi/systems/sys_81_710_electric.lua @@ -118,7 +118,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.RRP = S["U2"]*T[18] - Train.Panel.Sequence = ARS.GE*Train.BSM_GE.Value*(1-Train.BSM_RNT.Value) + Panel.LKVT = ARS.GE*Train.BSM_GE.Value*(1-Train.BSM_RNT.Value) local RCU = KV.RCU diff --git a/lua/metrostroi/systems/sys_81_710_panel.lua b/lua/metrostroi/systems/sys_81_710_panel.lua index eebe7cc..39116ed 100644 --- a/lua/metrostroi/systems/sys_81_710_panel.lua +++ b/lua/metrostroi/systems/sys_81_710_panel.lua @@ -78,7 +78,7 @@ function TRAIN_SYSTEM:Initialize() self.RRP = 0 self.TW18 = 0 self.SD = 0 - self.Sequence = 0 + self.LKVT = 0 self.Headlights1 = 0 self.Headlights2 = 0 self.RedLights = 0 @@ -110,5 +110,5 @@ function TRAIN_SYSTEM:Initialize() end function TRAIN_SYSTEM:Outputs() - return { "V1","GRP","RRP","TW18","SD","Sequence","Headlights1","Headlights2","RedLights","EmergencyLights2","EmergencyLights1","MainLights1","MainLights2","Ring","KT","AnnouncerPlaying","AVU","PanelLights","GaugeLights","VPR","AR04","AR0","AR40","AR60","AR70","AR80","KT","KVD","CBKIPower","PCBKPower"} + return { "V1","GRP","RRP","TW18","SD","LKVT","Headlights1","Headlights2","RedLights","EmergencyLights2","EmergencyLights1","MainLights1","MainLights2","Ring","KT","AnnouncerPlaying","AVU","PanelLights","GaugeLights","VPR","AR04","AR0","AR40","AR60","AR70","AR80","KT","KVD","CBKIPower","PCBKPower"} end \ No newline at end of file diff --git a/lua/metrostroi_data/languages/cz_702.lua b/lua/metrostroi_data/languages/cz_702.lua index f054290..0c53497 100644 --- a/lua/metrostroi_data/languages/cz_702.lua +++ b/lua/metrostroi_data/languages/cz_702.lua @@ -41,7 +41,7 @@ Common.703.KRR = KRR: Tlačítko obracení reversů do první p Common.703.RUT = Regulace RUT (pomalejší akcelerace) Common.707.SEQ = Kontrolka rotování reostatu kontroléru Common.707.TAH = TAH: Nouzová jízda bez ARS -Common.710.RK = Reostat kontroléru je ve střední poloze +Common.710.LKVT = LKVT: Kontrolka tlačítko bdělosti Common.710.SAMMSchemeOff = SAMM: Tlačítko vypnutí trakce RAV Common.710.SAMMStart = SAMM: Tlačítko aktivace RAV @@ -564,7 +564,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/de_702.lua b/lua/metrostroi_data/languages/de_702.lua index 3ae2aba..2948e8e 100644 --- a/lua/metrostroi_data/languages/de_702.lua +++ b/lua/metrostroi_data/languages/de_702.lua @@ -32,7 +32,7 @@ Common.703.KRR = KRR: Schaltwerk in erste Position drehen Common.703.RUT = RUT anpassen (reduziert Beschleunigung) Common.707.SEQ = Schaltwerk ist in Bewegung Common.707.TAH = TAH: Fahren ohne Zugsicherung -Common.710.RK = Schaltwerk in Zwischenposition +Common.710.LKVT = LKVT: Leuchtmelder fuer bremsempfehlung wahrgenommen Common.710.SAMMSchemeOff = SAMM Anhalten Common.710.SAMMStart = SAMM Start Common.710.SAMMReset = SAMM: Reset @@ -492,7 +492,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/en_702.lua b/lua/metrostroi_data/languages/en_702.lua index f81e3de..4a82cbd 100644 --- a/lua/metrostroi_data/languages/en_702.lua +++ b/lua/metrostroi_data/languages/en_702.lua @@ -41,8 +41,7 @@ Common.703.KRR = KRR: Rotate RK to the first position #FIXME Common.703.RUT = RUT adjustment (reduced acceleration) Common.707.SEQ = Rheostat controller motion lamp Common.707.TAH = TAH: Emergency drive mode for driving without ARS -Common.710.RK = Rheostat controller is in intermediate position -Common.710.LKVT = Attention light #NEW #FIXME +Common.710.LKVT = LKVT: Brake perception button lamp Common.710.SAMMSchemeOff = SAMM stop button Common.710.SAMMStart = SAMM start button @@ -565,7 +564,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/fr_702.lua b/lua/metrostroi_data/languages/fr_702.lua index 0205cb7..597f8c1 100644 --- a/lua/metrostroi_data/languages/fr_702.lua +++ b/lua/metrostroi_data/languages/fr_702.lua @@ -41,7 +41,7 @@ Common.703.KRR = KRR: Tourner le RK à la première position Common.703.RUT = Ajustement RUT (accéleration réduite) Common.707.SEQ = Lampe de mouvement de la manette rhéostat Common.707.TAH = TAH: Mode de conduite d'urgence sans ARS -Common.710.RK = La manette rhéostat est en position intermédiaire +Common.710.LKVT = LKVT: Lampe de bouton de confirmation de freinage Common.710.SAMMSchemeOff = Bouton stop SAMM Common.710.SAMMStart = Bouton start SAMM @@ -564,7 +564,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/hu_702.lua b/lua/metrostroi_data/languages/hu_702.lua index f0cb0b1..523f089 100644 --- a/lua/metrostroi_data/languages/hu_702.lua +++ b/lua/metrostroi_data/languages/hu_702.lua @@ -41,7 +41,7 @@ Common.703.KRR = KRR: RK elfordítása az első pozícióba Common.703.RUT = RUT beállítása (gyengített gyorsulás) Common.707.SEQ = Reosztát vezérlő mozgás visszajelző Common.707.TAH = TAH: Szükségmenet, ARS nélküli vezetéshez -Common.710.RK = Reosztát vezérlő középállásban +Common.710.LKVT = LKVT: Féknyugtázó gomb lámpa Common.710.SAMMSchemeOff = SAMM Leállító gomb Common.710.SAMMStart = SAMM Indító gomb @@ -564,7 +564,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/it_702.lua b/lua/metrostroi_data/languages/it_702.lua index 1c9bb6d..5aa25a7 100644 --- a/lua/metrostroi_data/languages/it_702.lua +++ b/lua/metrostroi_data/languages/it_702.lua @@ -36,7 +36,7 @@ Common.703.KRR = KRR: Ruota RK nella prima posizione Common.703.RUT = RUT regolazione (accelerazione ridotta) Common.707.SEQ = Spia di controllo del controller reostato Common.707.TAH = TAH: Modalità di guida d'emergenza per la guida senza ARS -Common.710.RK = Il controller del reostato è in posizione intermedia +Common.710.LKVT = LKVT: Segnale di pulsante percezione freno Common.710.SAMMSchemeOff = SAMM: bottone stop Common.710.SAMMStart = SAMM: bottone start @@ -546,7 +546,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/kr_702.lua b/lua/metrostroi_data/languages/kr_702.lua index b3d8bde..5428714 100644 --- a/lua/metrostroi_data/languages/kr_702.lua +++ b/lua/metrostroi_data/languages/kr_702.lua @@ -36,7 +36,7 @@ Common.703.KRR = KRR: RK를 첫번째 위치로 회전 Common.703.RUT = RUT 조정 (가속력 감소) Common.707.SEQ = 가변 저항 제어기 동작 표시등 Common.707.TAH = TAH: 비상 운전 모드 (ARS 미사용 주행) -Common.710.RK = 가변 저항 제어기가 중간 위치에 있음 +Common.710.LKVT = LKVT: 제동 확인 버튼 신호 Common.710.SAMMSchemeOff = SAMM 정지 버튼 Common.710.SAMMStart = SAMM 시작 버튼 @@ -556,7 +556,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/pl_702.lua b/lua/metrostroi_data/languages/pl_702.lua index 1ab4ef1..afc60b1 100644 --- a/lua/metrostroi_data/languages/pl_702.lua +++ b/lua/metrostroi_data/languages/pl_702.lua @@ -41,8 +41,7 @@ Common.703.KRR = KRR: Powrót RK do pierwszej pozycji Common.703.RUT = Regulacja RUT (zmniejszone przyspieszenie) Common.707.SEQ = Kontrolka pracy RK Common.707.TAH = TAH: Przełącznik jazdy awaryjnej w ruchu bez ARS -Common.710.RK = Kontrolka przejściowej pozycji RK -Common.710.LKVT = Attention light #NEW #FIXME +Common.710.LKVT = LKVT: Kontrolka przycisk kasowania hamowania Common.710.SAMMSchemeOff = Przycisk wyłączenia rozruchu w jeździe samoczynnej Common.710.SAMMStart = Przycisk rozruchu w jeździe samoczynnej @@ -565,7 +564,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD] diff --git a/lua/metrostroi_data/languages/ru_702.lua b/lua/metrostroi_data/languages/ru_702.lua index 9100022..72efc16 100644 --- a/lua/metrostroi_data/languages/ru_702.lua +++ b/lua/metrostroi_data/languages/ru_702.lua @@ -41,8 +41,7 @@ Common.703.KRR = Кнопка разворота реверсо Common.703.RUT = Регулировка РУТ(Пониженное ускорение) Common.707.SEQ = Лампа вращения РК Common.707.TAH = Тумблер аварийного хода для движения без АРС -Common.710.RK = Лампа нахождения РК в промежуточной позиции -Common.710.LKVT = Лампа бдительности +Common.710.LKVT = ЛКВТ: Лампа кнопки восприятия торможения Common.710.SAMMSchemeOff = Кнопка выключения тяги автоведения Common.710.SAMMStart = Кнопка пуска от автоведения @@ -566,7 +565,7 @@ Entities.gmod_subway_ezh3.Buttons.Main.V5Set = @[Common.703.LOff] Entities.gmod_subway_ezh3.Buttons.Main.KU11Set = @[Common.703.KSD] Entities.gmod_subway_ezh3.Buttons.Main.KVTSet = @[Common.ARS.KVT] Entities.gmod_subway_ezh3.Buttons.Main.KBSet = @[Common.ARS.KB] -Entities.gmod_subway_ezh3.Buttons.Main.RKLamp = @[Common.710.RK] +Entities.gmod_subway_ezh3.Buttons.Main.!LKVT = @[Common.710.LKVT] Entities.gmod_subway_ezh3.Buttons.Main.ARSToggle = @[Common.ALL.ARS] Entities.gmod_subway_ezh3.Buttons.Main.R_UNchToggle = @[Common.ALL.UNCh] Entities.gmod_subway_ezh3.Buttons.Main.V2Toggle = @[Common.ALL.VUD]