From f5e66dbd81bdef0034c2ca64f7c74e9ba40f7470 Mon Sep 17 00:00:00 2001 From: Hellss Date: Tue, 12 Jul 2022 16:34:30 +0300 Subject: [PATCH 1/3] Added OtklAVU 703, UKS Em509 --- lua/entities/gmod_subway_81-703/cl_init.lua | 40 +++++++++ lua/entities/gmod_subway_81-703/init.lua | 6 +- lua/entities/gmod_subway_81-703/shared.lua | 5 +- lua/entities/gmod_subway_em509/cl_init.lua | 18 +++- lua/entities/gmod_subway_em509/shared.lua | 2 +- lua/metrostroi/systems/sys_81_509_uks.lua | 41 --------- .../systems/sys_81_703_electric.lua | 12 +-- lua/metrostroi/systems/sys_81_703_panel.lua | 5 +- .../systems/sys_81_703_pneumatic.lua | 3 - lua/metrostroi/systems/sys_uks_20m.lua | 88 +++++++++++++++++++ lua/metrostroi_data/languages/cz_702.lua | 2 + lua/metrostroi_data/languages/de_702.lua | 2 + lua/metrostroi_data/languages/en_509.lua | 6 +- lua/metrostroi_data/languages/en_702.lua | 3 + lua/metrostroi_data/languages/fr_702.lua | 2 + lua/metrostroi_data/languages/hu_702.lua | 2 + lua/metrostroi_data/languages/it_702.lua | 2 + lua/metrostroi_data/languages/kr_702.lua | 2 + lua/metrostroi_data/languages/pl_702.lua | 2 + lua/metrostroi_data/languages/ru_509.lua | 6 +- lua/metrostroi_data/languages/ru_702.lua | 3 + 21 files changed, 189 insertions(+), 63 deletions(-) delete mode 100644 lua/metrostroi/systems/sys_81_509_uks.lua create mode 100644 lua/metrostroi/systems/sys_uks_20m.lua diff --git a/lua/entities/gmod_subway_81-703/cl_init.lua b/lua/entities/gmod_subway_81-703/cl_init.lua index 17293200..2e07eb68 100644 --- a/lua/entities/gmod_subway_81-703/cl_init.lua +++ b/lua/entities/gmod_subway_81-703/cl_init.lua @@ -264,6 +264,29 @@ ENT.ButtonMap["AVMain"] = { } } +ENT.ButtonMap["AVU"] = { + pos = Vector(456.9,-18,35.5), + ang = Angle(0,-95.5,90), + width = 95, + height = 85, + scale = 0.0625, + hideseat = 0.2, + + buttons = { + { ID = "OtklAVUToggle", x=48, y=51, radius=20, tooltip="", model = { + model = "models/metrostroi_train/81-710/ezh3_tumbler_t1.mdl",ang = 180,z=-2, + var="OtklAVU",speed=16, + plomb = {model = "models/metrostroi_train/81/plomb.mdl",ang=270,x=-1,y=24,z=-2,var="OtklAVUPl", ID="OtklAVUPl",}, + sndvol = 1, snd = function(val) return val and "switchbl_on" or "switchbl_off" end, + sndmin=30, sndmax = 1e3, sndang = Angle(-90,0,0), + }}, + {ID = "!AVULight", x=69, y=51, radius=10, tooltip="", model = { + model = "models/metrostroi_train/81-710/ezh3_slc77.mdl", skin = 3, z = -4, + lamp = {model = "models/metrostroi_train/81-717/buttons/slc_77_lamp.mdl",ang=62,x=-0.3,y=-0.3,z=20.6,var="AVU",color=Color(210,170,255),}, + sprite = {bright=0.2,size=.5,scale=0.03,z=20,color=Color(210,170,255),}, + }}, + } +} ---AV1 Panel ENT.ButtonMap["AV1"] = { @@ -613,6 +636,23 @@ ENT.ButtonMap["UAVAPanel"] = { } } +ENT.ButtonMap["UKSPanel"] = { + pos = Vector(397.9,-25,4), + ang = Angle(90,0,0), + width = 100, + height = 100, + scale = 0.0625, + + buttons = { + {ID = "UKSDisconnectToggle",x=0, y=0, w=100, h=100, tooltip="", model = { + model = "models/metrostroi_train/81-717/buttons/breaker_common001.mdl",z=15,ang=180, + var="UKSDisconnect",speed=0.5,vmin=1,vmax=0.87, + sndvol = 0.8,snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80,sndmax = 1e3/3,sndang = Angle(-90,0,0), + plomb = {model = "models/metrostroi_train/81/plomb_b.mdl",ang=30,x=28,y=-18,var="UKSDisconnectPl",ID="UKSDisconnectPl",z=-15,}, + }}, + } +} + for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { model = "models/metrostroi_train/common/bort_numbers.mdl", diff --git a/lua/entities/gmod_subway_81-703/init.lua b/lua/entities/gmod_subway_81-703/init.lua index da887dc6..acfae3e4 100644 --- a/lua/entities/gmod_subway_81-703/init.lua +++ b/lua/entities/gmod_subway_81-703/init.lua @@ -12,6 +12,8 @@ ENT.SyncTable = { "DriverValveBLDisconnect","DriverValveTLDisconnect","EmergencyBrakeValve", "GV", "R_Program1","R_Program2","UAVA","UAVAC", + "OtklAVU", + "UKSDisconnect", } ENT.SyncFunctions = { "" @@ -22,8 +24,9 @@ function ENT:Initialize() self.Plombs = { --RST = true, Init = true, - --OtklAVU = true, + OtklAVU = true, UAVA = true, + UKSDisconnect = true, } -- Set model and initialize self:SetModel("models/metrostroi_train/81-703/81-703.mdl") @@ -272,6 +275,7 @@ function ENT:Think() self:SetPackedBool("VPR",Panel.VPR > 0) self:SetPackedBool("Compressor",Pneumatic.Compressor == 1.0) self:SetPackedBool("RK",(self.RheostatController.Velocity ~= 0.0)) + self:SetPackedBool("AVU",Panel.AVU > 0.5) self:SetPackedBool("Ring",Panel.Ring > 0.5) self:SetPackedBool("RearDoor",self.RearDoor) diff --git a/lua/entities/gmod_subway_81-703/shared.lua b/lua/entities/gmod_subway_81-703/shared.lua index 57e10079..be2353c1 100644 --- a/lua/entities/gmod_subway_81-703/shared.lua +++ b/lua/entities/gmod_subway_81-703/shared.lua @@ -90,8 +90,8 @@ function ENT:InitializeSounds() self.SoundNames["avu_off"] = "subway_trains/717/relays/lsd_2.mp3" self.SoundNames["avu_on"] = "subway_trains/717/relays/new/kd_on.mp3" - self.SoundPositions["avu_on"] = {60,1e9, Vector(400,-40,-45),0.5} - self.SoundPositions["avu_off"] = {60,1e9, Vector(400,-40,-45),0.5} + self.SoundPositions["avu_on"] = {60,1e9, Vector(453,-40,-45),0.5} + self.SoundPositions["avu_off"] = {60,1e9, Vector(453,-40,-45),0.5} --Подвагонка self.SoundNames["lk2_on"] = "subway_trains/717/pneumo/lk1_on.mp3" self.SoundNames["lk2_off"] = "subway_trains/717/pneumo/lk2_off.mp3" @@ -560,6 +560,7 @@ function ENT:InitializeSystems() self:LoadSystem("LastStation","81_71_LastStation","710","door1") self:LoadSystem("ALSCoil") + self:LoadSystem("UKS","UKS_20M") end function ENT:PostInitializeSystems() self.Electric:TriggerInput("Type",self.Electric.E) diff --git a/lua/entities/gmod_subway_em509/cl_init.lua b/lua/entities/gmod_subway_em509/cl_init.lua index 6141a323..19f9982e 100644 --- a/lua/entities/gmod_subway_em509/cl_init.lua +++ b/lua/entities/gmod_subway_em509/cl_init.lua @@ -918,8 +918,22 @@ ENT.ButtonMap["UAVAPanel"] = { sndmin=30, sndmax = 1e3, sndang = Angle(-90,0,0), }}, {ID = "UAVACToggle",x=60, y=0, w=120, h=150, tooltip="",var="UAVAC",states={"Train.Buttons.UAVAOff","Train.Buttons.UAVAOn"}}, - {ID = "UKSDisconnectToggle",x=60, y=150, w=120, h=50, tooltip="",var="UKSDisconnect",states={"Train.Buttons.Closed","Train.Buttons.Opened"}, model = { - plomb = {var="UAVAPl", ID="UAVAPl",}, + } +} + +ENT.ButtonMap["UKSPanel"] = { + pos = Vector(403.1,-25,0), + ang = Angle(90,0,0), + width = 100, + height = 100, + scale = 0.0625, + + buttons = { + {ID = "UKSDisconnectToggle",x=0, y=0, w=100, h=100, tooltip="", model = { + model = "models/metrostroi_train/81-717/buttons/breaker_common001.mdl",z=15,ang=180, + var="UKSDisconnect",speed=0.5,vmin=1,vmax=0.87, + sndvol = 0.8,snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80,sndmax = 1e3/3,sndang = Angle(-90,0,0), + plomb = {model = "models/metrostroi_train/81/plomb_b.mdl",ang=30,x=28,y=-18,var="UKSDisconnectPl",ID="UKSDisconnectPl",z=-15,}, }}, } } diff --git a/lua/entities/gmod_subway_em509/shared.lua b/lua/entities/gmod_subway_em509/shared.lua index 9497f296..74b8063f 100644 --- a/lua/entities/gmod_subway_em509/shared.lua +++ b/lua/entities/gmod_subway_em509/shared.lua @@ -587,7 +587,7 @@ function ENT:InitializeSystems() self:LoadSystem("IGLA_PCBK") self:LoadSystem("ALSCoil") - self:LoadSystem("UKS","81_509_UKS") + self:LoadSystem("UKS","UKS_20M") end function ENT:PostInitializeSystems() self.Electric:TriggerInput("Type",self.Electric.Em) diff --git a/lua/metrostroi/systems/sys_81_509_uks.lua b/lua/metrostroi/systems/sys_81_509_uks.lua deleted file mode 100644 index 311fdd5c..00000000 --- a/lua/metrostroi/systems/sys_81_509_uks.lua +++ /dev/null @@ -1,41 +0,0 @@ --------------------------------------------------------------------------------- --- 81-508 UKS system --------------------------------------------------------------------------------- --- Copyright (C) 2013-2018 Metrostroi Team & FoxWorks Aerospace s.r.o. --- Contains proprietary code. See license.txt for additional information. --------------------------------------------------------------------------------- -Metrostroi.DefineSystem("81_509_UKS") - -function TRAIN_SYSTEM:Initialize(parameters) - self.UKSEngaged = 0 - self.UKSTriggered = 0 - self.UKSEmerTriggered = 0 - self.Train:LoadSystem("UKSDisconnect","Relay","Switch", {bass = true,normally_closed = true}) -end - -function TRAIN_SYSTEM:Outputs() - return { "UKSEngaged", "UKSTriggered", "UKSEmerTriggered" } -end - -function TRAIN_SYSTEM:Think(dT) - local Train = self.Train - self.UKSEngaged = Train.UAVA.Value*Train.UKSDisconnect.Value - if self.UKSEngaged > 0 then - local speed = Train.ALSCoil.Speed*Train.ALSCoil.SpeedSign - if speed > 34 then - self.UKSTriggered = 1 - if speed > 40 then - self.UKSEmerTriggered = 1 - end - elseif speed < 31 and self.UKSEmerTriggered == 0 then - self.UKSTriggered = 0 - self.UKSEmerTriggered = 0 - elseif speed < 1 then - self.UKSTriggered = 0 - self.UKSEmerTriggered = 0 - end - else - self.UKSTriggered = 0 - self.UKSEmerTriggered = 0 - end -end diff --git a/lua/metrostroi/systems/sys_81_703_electric.lua b/lua/metrostroi/systems/sys_81_703_electric.lua index a6551d03..a55a004b 100644 --- a/lua/metrostroi/systems/sys_81_703_electric.lua +++ b/lua/metrostroi/systems/sys_81_703_electric.lua @@ -103,8 +103,8 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train) Train:WriteTrainWire(4,S["10AK"]*KV["U2-4"]) Train:WriteTrainWire(5,S["10AK"]*KV["U2-5"]+KRU["5/3-ZM31"]*-10*(1-Train.KRR.Value)+BO*KRU["14/1-B3"]*Train.KRR.Value) --Panel.Sequence = T[2] - Panel.UKS = BO*Train.UKS.UKSEngaged - Panel.UKSb = BO*Train.UKS.UKSTriggered + Panel.UKS = Train.UKS.UKSLamp + Panel.UKSb = Train.UKS.UKSTriggered if self.RRI> 0 then local RRI_VV = Train.RRI_VV RRI_VV.Power = BO*Train["50V"].Value*Train.RRIEnable.Value @@ -132,18 +132,18 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train) Panel.AnnouncerPlaying = T[13] Train:WriteTrainWire(24,S["U2"]*Train.KU8.Value) if isE then - Train:WriteTrainWire(14,BO*KV["10-14B"]*KV["14-14B"]) + Train:WriteTrainWire(14,BO*KV["10-14B"]*KV["14-14B"]*(1-Train.UKS.UKSEmerTriggered)) Train:WriteTrainWire(1,S["10AK"]*Train.R1_5.Value) Train:WriteTrainWire(2,S["U2"]*KV["U2-2"]) Train:WriteTrainWire(3,S["U2"]*KV["U2-3"]) Train:WriteTrainWire(25,S["U2"]*KV["U2-25"]) Train:WriteTrainWire(20,S["U2"]*KV["U2-20"]) Train:WriteTrainWire(6,S["U2"]*KV["U2-6"]) - Train.RV2:TriggerInput("Set",S["10AK"]*KV["10AK-7A"]) + Train.RV2:TriggerInput("Set",S["10AK"]*KV["10AK-7A"]*(Train.AVU.Value+Train.OtklAVU.Value)*(1-Train.UKS.UKSTriggered)) Train.R1_5:TriggerInput("Set",S["10AK"]*Train.RV2.Value) Train:WriteTrainWire(17,S["10AK"]*Train.KU9.Value) - Train:WriteTrainWire(8,BO*KV["10-8"]) + Train:WriteTrainWire(8,BO*(KV["10-8"]+KV["10-14B"]*Train.UKS.UKSEmerTriggered)) elseif isEzh then S["10a"] = BO*KV["10a-8"] ARS.ALS = S["10a"]*Train.ALS.Value*RC @@ -199,7 +199,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train) Train.RV2:TriggerInput("Set",S["10AK"]*KV["33-10AK"]*(Train.AVU.Value+Train.OtklAVU.Value)*Train.UAVAC.Value*(1-Train.UKS.UKSTriggered)) Train.R1_5:TriggerInput("Set",S["10AK"]*Train.RV2.Value) Train:WriteTrainWire(17,S["10AK"]*Train.KU9.Value) - Train:WriteTrainWire(8,BO*KV["10-8"]) + Train:WriteTrainWire(8,BO*(KV["10-8"]+KV["10a-8"]*Train.UKS.UKSEmerTriggered)) Train:WriteTrainWire(44,S["10AK"]*Train.UV1.Value) end diff --git a/lua/metrostroi/systems/sys_81_703_panel.lua b/lua/metrostroi/systems/sys_81_703_panel.lua index 833fa618..4b064876 100644 --- a/lua/metrostroi/systems/sys_81_703_panel.lua +++ b/lua/metrostroi/systems/sys_81_703_panel.lua @@ -37,6 +37,8 @@ function TRAIN_SYSTEM:Initialize() self.Train:LoadSystem("RCU","Relay","Switch", {bass = true}) + self.Train:LoadSystem("OtklAVU","Relay","Switch", {bass = true}) + self.Train:LoadSystem("R_UNch","Relay","Switch", {bass = true}) self.Train:LoadSystem("R_ZS","Relay","Switch", {bass = true}) self.Train:LoadSystem("R_G","Relay","Switch", {bass = true}) @@ -67,6 +69,7 @@ function TRAIN_SYSTEM:Initialize() self.PanelLights = 0 self.Ring = 0 + self.AVU = 0 self.VPR = 0 @@ -81,5 +84,5 @@ function TRAIN_SYSTEM:ClientInitialize() end function TRAIN_SYSTEM:Outputs() - return { "V1","GRP","RRP","TW18","SD","PP1","PP6","SDW","BrY","Headlights1","Headlights2","RedLights","EmergencyLights2","EmergencyLights1","MainLights1","MainLights2","PanelLights","AnnouncerPlaying","VPR","Ring","CBKIPower","PCBKPower"} + return { "V1","GRP","RRP","TW18","SD","PP1","PP6","SDW","BrY","Headlights1","Headlights2","RedLights","EmergencyLights2","EmergencyLights1","MainLights1","MainLights2","PanelLights","AnnouncerPlaying","VPR","Ring","AVU","CBKIPower","PCBKPower"} end \ No newline at end of file diff --git a/lua/metrostroi/systems/sys_81_703_pneumatic.lua b/lua/metrostroi/systems/sys_81_703_pneumatic.lua index 91cb5ec9..90f23713 100644 --- a/lua/metrostroi/systems/sys_81_703_pneumatic.lua +++ b/lua/metrostroi/systems/sys_81_703_pneumatic.lua @@ -383,9 +383,6 @@ function TRAIN_SYSTEM:Think(dT) self.EmergencyValveDisable=false self.EmergencyValve=false end - if Train.UKS and Train.UKS.UKSEmerTriggered > 0 and Train.UKSDisconnect.Value > 0 then - self.EmergencyValve=true - end self.OldBrakeLinePressure = self.BrakeLinePressure if self.EmergencyValve then diff --git a/lua/metrostroi/systems/sys_uks_20m.lua b/lua/metrostroi/systems/sys_uks_20m.lua new file mode 100644 index 00000000..9166d478 --- /dev/null +++ b/lua/metrostroi/systems/sys_uks_20m.lua @@ -0,0 +1,88 @@ +-------------------------------------------------------------------------------- +-- UKS system +-------------------------------------------------------------------------------- +-- Copyright (C) 2013-2018 Metrostroi Team & FoxWorks Aerospace s.r.o. +-- Contains proprietary code. See license.txt for additional information. +-------------------------------------------------------------------------------- +Metrostroi.DefineSystem("UKS_20M") + +function TRAIN_SYSTEM:Initialize(parameters) + self.UKSLamp = 0 + self.UKSTriggered = 0 + self.UKSEmerTriggered = 0 + self.UKSEmerTriggeredX = false + self.UKSEmerTriggeredT = false + self.UKSEmerTriggeredV = false + self.UKSEmerTriggeredReal = false + self.Train:LoadSystem("UKSDisconnect","Relay","Switch", {bass = true,normally_closed = true}) +end + +function TRAIN_SYSTEM:Outputs() + return { "UKSLamp", "UKSTriggered", "UKSEmerTriggered" } +end + +function TRAIN_SYSTEM:Think(dT) + local Train = self.Train + local KV = Train.KV + if Train.Panel.V1*(KV["10a-8"] or KV["10-14B"])*Train.UAVA.Value*Train.UKSDisconnect.Value > 0 then + local speed = Train.ALSCoil.Speed*Train.ALSCoil.SpeedSign + local KVX = KV["33-10AK"] or KV["10AK-7A"] + local KVTr = KV["U2-6"] + if speed <= -1 or KV["U2-4"] == 1 then + self.UKSEmerTriggered = 1 + self.UKSTriggered = 1 + self.UKSLamp = 1 + elseif speed > 18 then + self.UKSLamp = 1 + self.UKSTriggered = 1 + if speed > 20 and self.UKSEmerTriggered ~= 1 then + self.UKSEmerTriggered = 1 + self.UKSEmerTriggeredReal = true + self.UKSEmerTriggeredX = KVX > 0 + self.UKSEmerTriggeredT = KVTr > 0 + self.UKSEmerTriggeredV = false + end + elseif speed <= 1 then + if self.UKSEmerTriggered > 0 and KVX > 0 then + if not self.Starting then self.Starting = CurTime() end + elseif KVX == 0 and self.UKSEmerTriggered == 0 then + self.Starting = nil + end + if self.Starting then + if CurTime()-self.Starting > 5 then self.UKSEmerTriggered = 1 self.UKSTriggered = 1 end + end + if self.UKSTriggered > 0 then + self.UKSTriggered = KVX + self.UKSEmerTriggered = KVX + else + self.UKSEmerTriggered = 1-KVX + self.UKSEmerTriggeredReal = false + end + self.UKSLamp = self.UKSEmerTriggered + elseif speed <= 18 and self.UKSEmerTriggered > 0 and self.UKSEmerTriggeredReal and not self.UKSEmerTriggeredX then + self.UKSLamp = 0 + if KVTr+KVX == 0 then self.UKSEmerTriggeredV = true end + if self.UKSEmerTriggeredV then + if self.UKSEmerTriggeredT then + self.UKSEmerTriggered = 1-KVTr + else + self.UKSEmerTriggered = 1-KVX + end + self.UKSEmerTriggeredReal = self.UKSEmerTriggered > 0 + self.UKSTriggered = self.UKSEmerTriggered + end + elseif speed <= 16 and self.UKSTriggered > 0 and self.UKSEmerTriggered == 0 then + self.UKSTriggered = KVX + self.UKSEmerTriggered = KVX + self.UKSLamp = KVX + else + if self.Starting then + if CurTime()-self.Starting > 5 then self.UKSEmerTriggered = 1 self.UKSTriggered = 1 self.Starting = nil elseif speed > 3 then self.Starting = nil end + end + end + else + self.UKSTriggered = 0 + self.UKSEmerTriggered = 0 + self.UKSLamp = 0 + end +end diff --git a/lua/metrostroi_data/languages/cz_702.lua b/lua/metrostroi_data/languages/cz_702.lua index 4937db77..f71c6655 100644 --- a/lua/metrostroi_data/languages/cz_702.lua +++ b/lua/metrostroi_data/languages/cz_702.lua @@ -221,6 +221,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] diff --git a/lua/metrostroi_data/languages/de_702.lua b/lua/metrostroi_data/languages/de_702.lua index 2e5ec602..d9c1b4e3 100644 --- a/lua/metrostroi_data/languages/de_702.lua +++ b/lua/metrostroi_data/languages/de_702.lua @@ -190,6 +190,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeRight = @[Common.703.ParkingBrakeRight] diff --git a/lua/metrostroi_data/languages/en_509.lua b/lua/metrostroi_data/languages/en_509.lua index 47968baa..e37ba7f4 100644 --- a/lua/metrostroi_data/languages/en_509.lua +++ b/lua/metrostroi_data/languages/en_509.lua @@ -6,8 +6,8 @@ return [[ #######Buttons########### #Common Common.509.50V = +50V: Additional consumers -Common.509.UKS = Speed limiter active -Common.509.UKSDisconnect = Speed limiter disable valve +Common.509.UKS = UKS work (Speed limiter active) +Common.509.UKSDisconnect = RC-UKS (Speed limiter disconnect) Common.509.Heaters = Passenger compartment heater @@ -99,7 +99,7 @@ Entities.gmod_subway_em509.Buttons.ParkingBrake.ParkingBrakeLeft Entities.gmod_subway_em509.Buttons.ParkingBrake.ParkingBrakeRight = @[Common.703.ParkingBrakeRight] Entities.gmod_subway_em509.Buttons.UAVAPanel.UAVAToggle = @[Common.ALL.UAVA] Entities.gmod_subway_em509.Buttons.UAVAPanel.UAVACToggle = @[Common.ALL.UAVAContact] -Entities.gmod_subway_em509.Buttons.UAVAPanel.UKSDisconnectToggle = @[Common.509.UKSDisconnect] +Entities.gmod_subway_em509.Buttons.UKSPanel.UKSDisconnectToggle = @[Common.509.UKSDisconnect] Entities.gmod_subway_em509.Buttons.DriverValveBLDisconnect.DriverValveBLDisconnectToggle = @[Common.ALL.DriverValveBLDisconnect] Entities.gmod_subway_em509.Buttons.DriverValveTLDisconnect.DriverValveTLDisconnectToggle = @[Common.ALL.DriverValveTLDisconnect] Entities.gmod_subway_em509.Buttons.EPKDisconnect.EPKToggle = @[Common.ALL.EPK] diff --git a/lua/metrostroi_data/languages/en_702.lua b/lua/metrostroi_data/languages/en_702.lua index 0562cf05..6c71751b 100644 --- a/lua/metrostroi_data/languages/en_702.lua +++ b/lua/metrostroi_data/languages/en_702.lua @@ -221,12 +221,15 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeRight = @[Common.703.ParkingBrakeRight] Entities.gmod_subway_81-703.Buttons.UAVAPanel.UAVAToggle = @[Common.ALL.UAVA] Entities.gmod_subway_81-703.Buttons.UAVAPanel.UAVACToggle = @[Common.ALL.UAVAContact] +Entities.gmod_subway_81-703.Buttons.UKSPanel.UKSDisconnectToggle = @[Common.509.UKSDisconnect] Entities.gmod_subway_81-703.Buttons.DriverValveBLDisconnect.DriverValveBLDisconnectToggle = @[Common.ALL.DriverValveBLDisconnect] Entities.gmod_subway_81-703.Buttons.DriverValveTLDisconnect.DriverValveTLDisconnectToggle = @[Common.ALL.DriverValveTLDisconnect] Entities.gmod_subway_81-703.Buttons.FrontPneumatic.FrontBrakeLineIsolationToggle = @[Common.ALL.FrontBrakeLineIsolationToggle] diff --git a/lua/metrostroi_data/languages/fr_702.lua b/lua/metrostroi_data/languages/fr_702.lua index 7e7e50a3..4f41f215 100644 --- a/lua/metrostroi_data/languages/fr_702.lua +++ b/lua/metrostroi_data/languages/fr_702.lua @@ -221,6 +221,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] diff --git a/lua/metrostroi_data/languages/hu_702.lua b/lua/metrostroi_data/languages/hu_702.lua index db6776a2..7076c4a4 100644 --- a/lua/metrostroi_data/languages/hu_702.lua +++ b/lua/metrostroi_data/languages/hu_702.lua @@ -221,6 +221,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] diff --git a/lua/metrostroi_data/languages/it_702.lua b/lua/metrostroi_data/languages/it_702.lua index ce9ccfa6..476665e6 100644 --- a/lua/metrostroi_data/languages/it_702.lua +++ b/lua/metrostroi_data/languages/it_702.lua @@ -209,6 +209,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] diff --git a/lua/metrostroi_data/languages/kr_702.lua b/lua/metrostroi_data/languages/kr_702.lua index 98459a96..651b04ed 100644 --- a/lua/metrostroi_data/languages/kr_702.lua +++ b/lua/metrostroi_data/languages/kr_702.lua @@ -213,6 +213,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] diff --git a/lua/metrostroi_data/languages/pl_702.lua b/lua/metrostroi_data/languages/pl_702.lua index 5dcf7b44..b5ceef12 100644 --- a/lua/metrostroi_data/languages/pl_702.lua +++ b/lua/metrostroi_data/languages/pl_702.lua @@ -221,6 +221,8 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] diff --git a/lua/metrostroi_data/languages/ru_509.lua b/lua/metrostroi_data/languages/ru_509.lua index 6e602866..c56f1d1c 100644 --- a/lua/metrostroi_data/languages/ru_509.lua +++ b/lua/metrostroi_data/languages/ru_509.lua @@ -6,8 +6,8 @@ return [[ #######Buttons########### #Common Common.509.50V = +50В: Питание дополнительных потребителий -Common.509.UKS = Работа устройства ограничения скорости -Common.509.UKSDisconnect = Кран отключения устройства ограничения скорости +Common.509.UKS = Работа УКС (устройства контроля скорости) +Common.509.UKSDisconnect = РЦ-УКС (устройства контроля скорости) Common.509.Heaters = Включение отопления салонов @@ -99,7 +99,7 @@ Entities.gmod_subway_em509.Buttons.ParkingBrake.ParkingBrakeLeft Entities.gmod_subway_em509.Buttons.ParkingBrake.ParkingBrakeRight = @[Common.703.ParkingBrakeRight] Entities.gmod_subway_em509.Buttons.UAVAPanel.UAVAToggle = @[Common.ALL.UAVA] Entities.gmod_subway_em509.Buttons.UAVAPanel.UAVACToggle = @[Common.ALL.UAVAContact] -Entities.gmod_subway_em509.Buttons.UAVAPanel.UKSDisconnectToggle = @[Common.509.UKSDisconnect] +Entities.gmod_subway_em509.Buttons.UKSPanel.UKSDisconnectToggle = @[Common.509.UKSDisconnect] Entities.gmod_subway_em509.Buttons.DriverValveBLDisconnect.DriverValveBLDisconnectToggle = @[Common.ALL.DriverValveBLDisconnect] Entities.gmod_subway_em509.Buttons.DriverValveTLDisconnect.DriverValveTLDisconnectToggle = @[Common.ALL.DriverValveTLDisconnect] Entities.gmod_subway_em509.Buttons.EPKDisconnect.EPKToggle = @[Common.ALL.EPK] diff --git a/lua/metrostroi_data/languages/ru_702.lua b/lua/metrostroi_data/languages/ru_702.lua index 653e4167..56e962ea 100644 --- a/lua/metrostroi_data/languages/ru_702.lua +++ b/lua/metrostroi_data/languages/ru_702.lua @@ -222,12 +222,15 @@ Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet2 = @[Common.RRI.R Entities.gmod_subway_81-703.Buttons.RRI.RRIRewindSet0 = @[Common.RRI.RRIRewindSet0] Entities.gmod_subway_81-703.Buttons.RRI.RRIAmplifierToggle = @[Common.RRI.RRIAmplifierToggle] Entities.gmod_subway_81-703.Buttons.RRI.!RRIOn = @[Common.RRI.RRIOn] +Entities.gmod_subway_81-703.Buttons.AVU.OtklAVUToggle = @[Common.ALL.OAVU] +Entities.gmod_subway_81-703.Buttons.AVU.!AVULight = @[Common.ALL.LAVU] Entities.gmod_subway_81-703.Buttons.Stopkran.EmergencyBrakeValveToggle = @[Common.ALL.EmergencyBrakeValve] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeLeft = @[Common.703.ParkingBrakeLeft] Entities.gmod_subway_81-703.Buttons.ParkingBrake.ParkingBrakeRight = @[Common.703.ParkingBrakeRight] Entities.gmod_subway_81-703.Buttons.UAVAPanel.UAVAToggle = @[Common.ALL.UAVA] Entities.gmod_subway_81-703.Buttons.UAVAPanel.UAVACToggle = @[Common.ALL.UAVAContact] +Entities.gmod_subway_81-703.Buttons.UKSPanel.UKSDisconnectToggle = @[Common.509.UKSDisconnect] Entities.gmod_subway_81-703.Buttons.DriverValveBLDisconnect.DriverValveBLDisconnectToggle = @[Common.ALL.DriverValveBLDisconnect] Entities.gmod_subway_81-703.Buttons.DriverValveTLDisconnect.DriverValveTLDisconnectToggle = @[Common.ALL.DriverValveTLDisconnect] Entities.gmod_subway_81-703.Buttons.FrontPneumatic.FrontBrakeLineIsolationToggle = @[Common.ALL.FrontBrakeLineIsolationToggle] From c164d7d54bfef598471995da3f4ccbe388ea88dc Mon Sep 17 00:00:00 2001 From: CrIcKeT Date: Sat, 13 Aug 2022 18:28:42 +0300 Subject: [PATCH 2/3] Added AVU --- materials/models/metrostroi_train/81-703/1002.vmt | 13 +++++++++++++ models/metrostroi_train/81-703/703_cabine.dx80.vtx | 4 ++-- models/metrostroi_train/81-703/703_cabine.dx90.vtx | 4 ++-- models/metrostroi_train/81-703/703_cabine.mdl | 4 ++-- models/metrostroi_train/81-703/703_cabine.sw.vtx | 4 ++-- models/metrostroi_train/81-703/703_cabine.vvd | 4 ++-- 6 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 materials/models/metrostroi_train/81-703/1002.vmt diff --git a/materials/models/metrostroi_train/81-703/1002.vmt b/materials/models/metrostroi_train/81-703/1002.vmt new file mode 100644 index 00000000..d284b80d --- /dev/null +++ b/materials/models/metrostroi_train/81-703/1002.vmt @@ -0,0 +1,13 @@ +"VertexLitGeneric" +{ + "$basetexture" "models/metrostroi_train/81-509/1002" + + "$phong" "1" + "$bumpmap" "models/metrostroi_train/81-509/1002_n" + "$phongexponenttexture" "models/metrostroi_train/81-509/1002_s" + "$phongboost" 3 + "$phongfresnelranges" "[0.1 0.1 0.1]" + $envmap env_cubemap + $normalmapalphaenvmapmask 1 + $envmaptint "[0.01 0.01 0.01]" +} \ No newline at end of file diff --git a/models/metrostroi_train/81-703/703_cabine.dx80.vtx b/models/metrostroi_train/81-703/703_cabine.dx80.vtx index b4a5eb1c..993bf00c 100644 --- a/models/metrostroi_train/81-703/703_cabine.dx80.vtx +++ b/models/metrostroi_train/81-703/703_cabine.dx80.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83f95ac06019345966fdb3269555136d72bb416a23d349f31a878fe7dbba2ce5 -size 564196 +oid sha256:6c5c12ab3e0fe71af063e4e20c4cb4a1efcafed51dc6abf72910bc776b092345 +size 604460 diff --git a/models/metrostroi_train/81-703/703_cabine.dx90.vtx b/models/metrostroi_train/81-703/703_cabine.dx90.vtx index 69de477d..14c6b72e 100644 --- a/models/metrostroi_train/81-703/703_cabine.dx90.vtx +++ b/models/metrostroi_train/81-703/703_cabine.dx90.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2cc2a0abb063a8505e9787e02f5fe03b84b1369954f9f6e1ecc9a84f81c64e8 -size 564196 +oid sha256:9be543b01a80d1ee241f6fa04a868f1a68cdfa4b68b7c91ac61e7fdce2362c99 +size 604460 diff --git a/models/metrostroi_train/81-703/703_cabine.mdl b/models/metrostroi_train/81-703/703_cabine.mdl index 01842a9b..2e240e12 100644 --- a/models/metrostroi_train/81-703/703_cabine.mdl +++ b/models/metrostroi_train/81-703/703_cabine.mdl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b881bf14b0b198a75679b33bdc577339121206c40a8bf5f1352de87a6790ee52 -size 3760 +oid sha256:5ca32c9068311a9816fef0a3e5d12167f5bbb574e3eddde0d2a15844875bcd57 +size 3948 diff --git a/models/metrostroi_train/81-703/703_cabine.sw.vtx b/models/metrostroi_train/81-703/703_cabine.sw.vtx index e940d98c..dc3042ce 100644 --- a/models/metrostroi_train/81-703/703_cabine.sw.vtx +++ b/models/metrostroi_train/81-703/703_cabine.sw.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a71db87b87083807d67d67cd824d56549549ee04ac37149c72be005642b586a -size 564124 +oid sha256:a67ace787dc137b969b78f3db3e033c20bab0efaae994af7e7a4b727c22fd855 +size 604388 diff --git a/models/metrostroi_train/81-703/703_cabine.vvd b/models/metrostroi_train/81-703/703_cabine.vvd index 4bff1506..e1968450 100644 --- a/models/metrostroi_train/81-703/703_cabine.vvd +++ b/models/metrostroi_train/81-703/703_cabine.vvd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f3c4ad30c7d8bfd4af4e07ee9556eb9fd6a4b26c7613c0b095edf76aaeb419d -size 2575424 +oid sha256:936d28792d78028ab06b58b94a7e85e7656e2f2ec6dcf1300ffea1468939002a +size 2725328 From ba5d0077ce171868d402216bc503b70408e1058e Mon Sep 17 00:00:00 2001 From: Hellss Date: Sun, 14 Aug 2022 14:33:42 +0300 Subject: [PATCH 3/3] FIX OtklAVU POS --- lua/entities/gmod_subway_81-703/cl_init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/entities/gmod_subway_81-703/cl_init.lua b/lua/entities/gmod_subway_81-703/cl_init.lua index 2e07eb68..cd429414 100644 --- a/lua/entities/gmod_subway_81-703/cl_init.lua +++ b/lua/entities/gmod_subway_81-703/cl_init.lua @@ -265,7 +265,7 @@ ENT.ButtonMap["AVMain"] = { } ENT.ButtonMap["AVU"] = { - pos = Vector(456.9,-18,35.5), + pos = Vector(455.35,-19.02,35.5), ang = Angle(0,-95.5,90), width = 95, height = 85,