From 158dab1c6d321a3b661c916d444c5770e8b3fcea Mon Sep 17 00:00:00 2001 From: Ivan Gordeev <70780122+kosmik641@users.noreply.github.com> Date: Wed, 26 May 2021 01:08:36 +0300 Subject: [PATCH] #47 (#111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 81-722, 81-723, 81-724. Перенос освещения с сервера на клиент. Добавление спрайтов на лампочки и кнопочки пульта. Перенос спрайтов. * 81-720, 81-721. Перенос освещения и спрайтов с сервера на клиент. Добавил спрайты на лампочки и светодиоды --- lua/entities/gmod_subway_81-720/cl_init.lua | 53 ++++- lua/entities/gmod_subway_81-720/init.lua | 39 +--- lua/entities/gmod_subway_81-721/cl_init.lua | 11 +- lua/entities/gmod_subway_81-721/init.lua | 17 +- lua/entities/gmod_subway_81-722/cl_init.lua | 213 +++++++++++--------- lua/entities/gmod_subway_81-722/init.lua | 50 +---- lua/entities/gmod_subway_81-723/cl_init.lua | 33 ++- lua/entities/gmod_subway_81-723/init.lua | 31 +-- lua/entities/gmod_subway_81-724/cl_init.lua | 27 ++- lua/entities/gmod_subway_81-724/init.lua | 25 +-- 10 files changed, 246 insertions(+), 253 deletions(-) diff --git a/lua/entities/gmod_subway_81-720/cl_init.lua b/lua/entities/gmod_subway_81-720/cl_init.lua index 7efbaa9..4a24ec5 100644 --- a/lua/entities/gmod_subway_81-720/cl_init.lua +++ b/lua/entities/gmod_subway_81-720/cl_init.lua @@ -56,6 +56,7 @@ ENT.ButtonMap["PUU"] = { buttons = { {ID = "!DoorsClosed",x=45.5, y=30.5, radius=8, tooltip = "Двери закрыты",model = { lamp = {model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl",var="DoorsClosed",z=-7, color=Color(120,255,50)}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(175,250,20),z=-2}, }}, {ID = "StandToggle",x=96, y=30.5, radius=15, tooltip = "Стоянка",model = { model = "models/metrostroi_train/81-720/tumbler1.mdl",z=-5, ang=180, @@ -68,6 +69,7 @@ ENT.ButtonMap["PUU"] = { lcolor=Color(200,150,60),lz = 16,lbright=2,lfov=140,lfar=16,lnear=8,lshadows=0}, var="Ticker",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(200,150,60),z=0}, }}, {ID = "KAHToggle",x=137.5+37.83*2, y=30.5, radius=15, tooltip = "КАХ",model = { model = "models/metrostroi_train/81-720/buttons/b5.mdl",z=6, @@ -75,6 +77,7 @@ ENT.ButtonMap["PUU"] = { lcolor=Color(160,255,220),lz = 10,lbright=2,lfov=155,lfar=16,lnear=8,lshadows=0}, var="KAH",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(160,255,220),z=0}, }}, {ID = "KAHkToggle",x=137.5+37.83*2-20, y=30.5+10, w=40,h=20, tooltip="Крышка кнопки КАХ\nKAH button cover", model = { model = "models/metrostroi_train/81/krishka.mdl", ang = 0, z = 1, @@ -90,6 +93,7 @@ ENT.ButtonMap["PUU"] = { lcolor=Color(255,80,100),lz = 10,lbright=2,lfov=155,lfar=16,lnear=8,lshadows=0}, var="ALS",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,80,100),z=0}, }}, {ID = "ALSkToggle",x=137.5+37.83*3-20, y=30.5+10, w=40,h=20, tooltip="Крышка кнопки АЛС\nALS button cover", model = { model = "models/metrostroi_train/81/krishka.mdl", ang = 0, z = 1, @@ -106,6 +110,7 @@ ENT.ButtonMap["PUU"] = { }}, {ID = "!HVoltage",x=137.5+37.83*5, y=30.5, radius=8, tooltip = "Сеть контактная",model = { lamp = {model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl",var="HVoltage",z=-7, color=Color(255,120,50)}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(255,120,50),z=-2}, }}, {ID = "PassSchemeToggle",x=137.5+37.83*6, y=30.5, radius=15, tooltip = "Табло наддверное",model = { model = "models/metrostroi_train/81-720/buttons/b4.mdl",z=6, @@ -113,6 +118,7 @@ ENT.ButtonMap["PUU"] = { lcolor=Color(255,255,255),lz = 16,lbright=2,lfov=140,lfar=16,lnear=8,lshadows=0}, var="PassScheme",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,255,255),z=0}, }}, {ID = "EmergencyCompressorSet",x=138+37.83*7, y=30.5, radius=15, tooltip = "Компрессор резервный",model = { model = "models/metrostroi_train/81-720/buttons/b7.mdl",z=7, @@ -145,6 +151,7 @@ ENT.ButtonMap["PUU"] = { lcolor=Color(50,150,200),lz = 16,lbright=2,lfov=140,lfar=4,lnear=2,lshadows=0}, var="R_Announcer",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(50,150,200),z=0}, }}, {ID = "R_LineToggle",x=566.63+35.75*2, y=30.5, radius=15, tooltip = "Линия",model = { model = "models/metrostroi_train/81-720/buttons/b3.mdl",z=6,--blue @@ -152,6 +159,7 @@ ENT.ButtonMap["PUU"] = { lcolor=Color(50,150,200),lz = 16,lbright=2,lfov=140,lfar=4,lnear=2,lshadows=0}, var="R_Line",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(50,150,200),z=0}, }}, {ID = "R_EmerSet",x=566.63+35.5*3, y=30.5, radius=15, tooltip = "Связь экстренная",model = { model = "models/metrostroi_train/81-720/buttons/b3.mdl",z=6,--blue @@ -226,6 +234,7 @@ ENT.ButtonMap["PUL"] = { lcolor=Color(255,255,255),lz = 16,lbright=2,lfov=140,lfar=16,lnear=8,lshadows=0}, var="DoorSelectL",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,255,255),z=0}, }}, {ID = "DoorSelectRToggle",x=78.5, y=79.5, radius=15, tooltip = "Выбор правых дверей",model = { model = "models/metrostroi_train/81-720/buttons/b4.mdl",z=-6, @@ -233,6 +242,7 @@ ENT.ButtonMap["PUL"] = { lcolor=Color(255,255,255),lz = 16,lbright=2,lfov=140,lfar=16,lnear=8,lshadows=0}, var="DoorSelectR",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,255,255),z=0}, }}, {ID = "DoorBlockToggle",x=65, y=126.5, radius=15, tooltip = "Блокировка дверей",model = { model = "models/metrostroi_train/81-720/buttons/b6.mdl",z=-6, @@ -240,9 +250,11 @@ ENT.ButtonMap["PUL"] = { lcolor=Color(255,80,100),lz = 16,lbright=2,lfov=140,lfar=16,lnear=8,lshadows=0}, var="DoorBlock",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,80,100),z=0}, }}, {ID = "!DoorLeftLamp",x=47, y=149, radius=8, tooltip = "Работа кнопки левых дверей",model = { lamp = {model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl",var="DoorLeftLamp",z=-3, color=Color(120,255,50)}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(175,250,20),z=-1}, }}, {ID = "DoorLeftSet",x=49, y=197, radius=15, tooltip = "Левые двери",model = { @@ -267,6 +279,7 @@ ENT.ButtonMap["PUR"] = { lamp = {model = "models/metrostroi_train/81-720/buttons/l1.mdl",var="AccelRateLamp",anim=true, lcolor=Color(255,255,255),lz = 16,lbright=2,lfov=140,lfar=16,lnear=8,lshadows=0}, sndvol = 0.3, snd = function(val) return val and "button_square_press" or "button_square_release" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,255,255),z=0}, }}, {ID = "EmerBrakeAddSet",x=58.5, y=79.5, radius=15, tooltip = "(резервный) Тормоз",model = { model = "models/metrostroi_train/81-720/buttons/b2.mdl",z=-6, @@ -285,6 +298,7 @@ ENT.ButtonMap["PUR"] = { var="EmerBrake",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), tooltipFunc = function(ent) return Format("%s%s",ent:GetPackedBool("EmerBrakeWork") and Metrostroi.GetPhrase("Train.Buttons.Active").."," or "",Metrostroi.GetPhrase(ent:GetPackedBool("EmerBrake") and "Train.Buttons.On" or "Train.Buttons.Off")) end, + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(255,80,100),z=0}, }}, {ID = "EmergencyBrakeToggle",x=188, y=79.5, radius=15, tooltip = "Тормоз экстренный",model = { model = "models/metrostroi_train/81-720/tumbler2.mdl",z=-2, ang=180, @@ -298,6 +312,7 @@ ENT.ButtonMap["PUR"] = { lcolor=Color(80,255,100),lz = 16,lbright=2,lfov=140,lfar=4,lnear=2,lshadows=0}, var="DoorClose",speed=12, vmin=0, vmax=1, sndvol = 0.3, snd = function(val) return val and "button_square_on" or "button_square_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0), + sprite = {bright=0.5,size=0.25,scale=0.03,vscale=0.03,color=Color(80,255,100),z=0}, }}, {ID = "AttentionMessageSet",x=58.5, y=119, radius=15, tooltip = "Восприятие сообщения",model = { model = "models/metrostroi_train/81-720/buttons/b6.mdl",z=-6, @@ -326,6 +341,7 @@ ENT.ButtonMap["PUR"] = { }}, {ID = "!DoorRightLamp",x=108.5, y=144, radius=8, tooltip = "Работа кнопки правых дверей",model = { lamp = {model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl",var="DoorRightLamp",z=-3, color=Color(120,255,50)}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(175,250,20),z=-1}, }}, } } @@ -465,21 +481,27 @@ ENT.ButtonMap["IGLAButtons"] = { {ID = "IGLA2DSet",x=65, y=53, w=12, h=7, tooltip="ИГЛА: Вторая кнопка вниз"}, {ID = "!IGLASR",x=17.9, y=10.5, radius=3, tooltip="ИГЛА: SR", model = { lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLASR",color=Color(175,250,20),z=-3.5}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(175,250,20),z=-1}, }}, {ID = "!IGLARX",x=27.5, y=10.5, radius=3, tooltip="ИГЛА: RX", model = { lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLARX",color=Color(255,56,30),z=-3.5}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(255,56,30),z=-1}, }}, {ID = "!IGLAErr",x=40.5, y=10.5, radius=3, tooltip="ИГЛА: Отказ", model = { - lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLAErr",color=Color(255,168,000),z=-3.5}, + lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLAErr",color=Color(255,168,0),z=-3.5}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(255,168,0),z=-1}, }}, {ID = "!IGLAOSP",x=50, y=10.5, radius=3, tooltip="ИГЛА: ОСП", model = { lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLAOSP",color=Color(175,250,20),z=-3.5}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(175,250,20),z=-1}, }}, {ID = "!IGLAPI",x=59.5, y=10.5, radius=3, tooltip="ИГЛА: ПИ", model = { lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLAPI",color=Color(255,56,30),z=-3.5}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(255,56,30),z=-1}, }}, {ID = "!IGLAOff",x=69, y=10.5, radius=3, tooltip="ИГЛА: Откл", model = { lamp = {speed=16,model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl", var="IGLAOff",color=Color(255,56,30),z=-3.5}, + sprite = {bright=0.4,size=0.25,scale=0.02,vscale=0.02,color=Color(255,56,30),z=-1}, }}, } } @@ -1565,8 +1587,22 @@ table.insert(ENT.ClientSounds["PB"],{"PB",function(ent,var) return var > 0 and " ENT.Lights = { -- Headlight glow [1] = { "headlight",Vector(495,0,-40),Angle(0,0,0),Color(216,161,92),farz=5144,brightness = 4, hfov=105,vfov=105, texture = "models/metrostroi_train/equipment/headlight",shadows = 1,headlight=true}, + [31] = { "light",Vector(500,-35,-29), Angle(0,0,0), Color(255,220,180), brightness = 0.2, scale = 2.5, texture = "sprites/light_glow02.vmt" }, + [32] = { "light",Vector(500, 35,-29), Angle(0,0,0), Color(255,220,180), brightness = 0.2, scale = 2.5, texture = "sprites/light_glow02.vmt" }, + -- Reverse [2] = { "headlight", Vector(495,0,-40), Angle(0,0,0), Color(255,0,0), fov=170 ,brightness = 0.1, farz=450,texture = "models/metrostroi_train/equipment/headlight2",shadows = 0,backlight=true}, + [33] = { "light",Vector(500,-50, -29), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, + [34] = { "light",Vector(500, 50, -29), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, + [35] = { "light",Vector(500,-50, -75), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, + [36] = { "light",Vector(500, 50, -75), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, + -- Apparats [3] = { "headlight", Vector(380,40,43.9), Angle(50,40,-0), Color(206,135,80), hfov=100, vfov=100,farz=200,brightness = 6,shadows=1}, + -- Cabin + [10] = { "dynamiclight", Vector( 440, 0, 13), Angle(0,0,0), Color(206,135,80), brightness = 0.7, distance = 550 }, + -- Interior + [15] = { "dynamiclight", Vector(-350, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.75, distance = 500, fov=180,farz = 128 }, + [16] = { "dynamiclight", Vector(-60, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.75, distance = 500, fov=180,farz = 128 }, + [17] = { "dynamiclight", Vector( 230, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.75, distance = 500, fov=180,farz = 128 }, } ENT.ButtonMap["Vityaz"] = { @@ -1663,6 +1699,10 @@ function ENT:Think() end self:SetLightPower(3,self.Door5 and self:GetPackedBool("AppLights"),self:GetPackedBool("AppLights") and 1 or 0) + local passlight = self:GetPackedRatio("SalonLighting") + self:SetLightPower(15,passlight>0,passlight) + self:SetLightPower(16,passlight>0,passlight) + self:SetLightPower(17,passlight>0,passlight) --ANIMS self:Animate("brake_line", self:GetPackedRatio("BL"), 0, 0.753, 256,2) self:Animate("train_line", self:GetPackedRatio("TL"), 0, 0.753, 4096,2) @@ -1696,10 +1736,11 @@ function ENT:Think() self:Animate("km013", Cpos[self:GetPackedRatio("Cran")] or 0, 0, 0.7, 2,false) self:Animate("PB", self:GetPackedBool("PB") and 1 or 0,0,0.2, 8,false) - self:ShowHideSmooth("lamps_emer",self:Animate("LampsEmer",self:GetPackedRatio("SalonLighting") == 0.4 and 1 or 0,0,1,5,false)) - self:ShowHideSmooth("lamps_full",self:Animate("LampsFull",self:GetPackedRatio("SalonLighting") == 1 and 1 or 0,0,1,5,false)) + self:ShowHideSmooth("lamps_emer",self:Animate("LampsEmer",passlight == 0.4 and 1 or 0,0,1,5,false)) + self:ShowHideSmooth("lamps_full",self:Animate("LampsFull",passlight == 1 and 1 or 0,0,1,5,false)) local cab_lamp = self:Animate("cab_lamp",self:GetPackedBool("CabinEnabledFull") and 1 or self:GetPackedBool("CabinEnabledEmer") and 0.5 or 0,0,1,5,false) + self:SetLightPower(10,cab_lamp>0,cab_lamp) self:ShowHideSmooth("cab_emer",cab_lamp) self:ShowHideSmooth("cab_full",cab_lamp) @@ -1751,7 +1792,13 @@ function ENT:Think() self:ShowHideSmooth("RedLights",RL) local headlights = HL1*0.4+HL2*0.6 self:SetLightPower(1,headlights>0,headlights) + self:SetLightPower(31,headlights>0,headlights) + self:SetLightPower(32,headlights>0,headlights) self:SetLightPower(2,RL>0,RL) + self:SetLightPower(33,RL>0,RL) + self:SetLightPower(34,RL>0,RL) + self:SetLightPower(35,RL>0,RL) + self:SetLightPower(36,RL>0,RL) if IsValid(self.GlowingLights[1]) then if self:GetPackedRatio("Headlights") < 1 and self.GlowingLights[1]:GetFarZ() ~= 4096 then self.GlowingLights[1]:SetFarZ(4096) diff --git a/lua/entities/gmod_subway_81-720/init.lua b/lua/entities/gmod_subway_81-720/init.lua index be95e99..d5008aa 100644 --- a/lua/entities/gmod_subway_81-720/init.lua +++ b/lua/entities/gmod_subway_81-720/init.lua @@ -178,26 +178,7 @@ function ENT:Initialize() [13] = 12, -- Reverser F<->B [38] = 37, -- Doors L<->R } - - self.Lights = { - [1] = { "light",Vector(500,-35,-29), Angle(0,0,0), Color(255,220,180), brightness = 0.2, scale = 2.5, texture = "sprites/light_glow02.vmt" }, - [2] = { "light",Vector(500, 35,-29), Angle(0,0,0), Color(255,220,180), brightness = 0.2, scale = 2.5, texture = "sprites/light_glow02.vmt" }, - - [3] = { "light",Vector(500,-50, -29), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, - [4] = { "light",Vector(500, 50, -29), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, - [5] = { "light",Vector(500,-50, -75), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, - [6] = { "light",Vector(500, 50, -75), Angle(0,0,0), Color(255,50,50), brightness = 0.1, scale = 1.5, texture = "sprites/light_glow02.vmt" }, - - [10] = { "dynamiclight", Vector( 440, 0, 13), Angle(0,0,0), Color(206,135,80), brightness = 0.7, distance = 550 }, - -- Interior - --[11] = { "dynamiclight", Vector( 200, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400 , fov=180,farz = 128 - [15] = { "dynamiclight", Vector(-350, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.75, distance = 500, fov=180,farz = 128 }, - [16] = { "dynamiclight", Vector(-60, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.75, distance = 500, fov=180,farz = 128 }, - [17] = { "dynamiclight", Vector( 230, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.75, distance = 500, fov=180,farz = 128 }, - --[13] = { "dynamiclight", Vector(-200, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400 , fov=180,farz = 128 }, - --[11] = { "dynamiclight", Vector( 100, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400 , fov=180,farz = 128 }, - --[12] = { "dynamiclight", Vector( 100, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400, fov=180,farz = 128 }, - } + self.InteractionZones = { { Pos = Vector(466, 64, 30), Radius = 48, @@ -303,21 +284,9 @@ function ENT:Think() local headlights = self.Panel.Headlights1*0.5+self.Panel.Headlights2*0.5 local redlights = self.Panel.RedLights>0 self:SetPackedBool("BacklightsEnabled",redlights) - self:SetLightPower(1,headlights>0,headlights) - self:SetLightPower(2,headlights>0,headlights) - self:SetLightPower(3,redlights) - self:SetLightPower(4,redlights) - self:SetLightPower(5,redlights) - self:SetLightPower(6,redlights) - local cablight = self.Panel.CabLights - self:SetLightPower(10,cablight > 0 ,cablight) - self:SetPackedBool("CabinEnabledEmer", cablight > 0) - self:SetPackedBool("CabinEnabledFull", cablight > 0.5) - local passlight = power and (self.BUV.MainLights and 1 or self.SFV20.Value > 0.5 and 0.4) or 0 - self:SetLightPower(15,passlight > 0, passlight) - self:SetLightPower(16,passlight > 0, passlight) - self:SetLightPower(17,passlight > 0, passlight) - self:SetPackedRatio("SalonLighting",passlight) + self:SetPackedBool("CabinEnabledEmer", self.Panel.CabLights > 0) + self:SetPackedBool("CabinEnabledFull", self.Panel.CabLights > 0.5) + self:SetPackedRatio("SalonLighting",power and (self.BUV.MainLights and 1 or self.SFV20.Value > 0.5 and 0.4) or 0) --self:SetPackedRatio("TrainLine",7.3/16) --self:SetPackedRatio("BrakeLine",5.2/16) --self:SetPackedRatio("BrakeCylinder",self.AsyncInverter.PN1*1.1/6) diff --git a/lua/entities/gmod_subway_81-721/cl_init.lua b/lua/entities/gmod_subway_81-721/cl_init.lua index 1055420..a96cbc5 100644 --- a/lua/entities/gmod_subway_81-721/cl_init.lua +++ b/lua/entities/gmod_subway_81-721/cl_init.lua @@ -444,8 +444,10 @@ for i=1,8 do } end ENT.Lights = { - -- Headlight glow - --[2] = { "dynamiclight", Vector( 300, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 4, distance = 550 }, + -- Interior + [15] = { "dynamiclight", Vector(-330, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.5, distance = 500, fov=180,farz = 128 }, + [16] = { "dynamiclight", Vector(-0, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.5, distance = 500, fov=180,farz = 128 }, + [17] = { "dynamiclight", Vector( 330, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.5, distance = 500, fov=180,farz = 128 }, } function ENT:Initialize() @@ -521,6 +523,11 @@ function ENT:Think() self.PassSchemesDone=false self.InvertSchemes = self:GetNW2Bool("PassSchemesInvert",false) end + + local passlight = self:GetPackedRatio("SalonLighting") + self:SetLightPower(15,passlight > 0, passlight) + self:SetLightPower(16,passlight > 0, passlight) + self:SetLightPower(17,passlight > 0, passlight) if self.LastGVValue ~= self:GetPackedBool("GV") then self.ResetTime = CurTime()+1.5 diff --git a/lua/entities/gmod_subway_81-721/init.lua b/lua/entities/gmod_subway_81-721/init.lua index 01bbe3b..b4f0243 100644 --- a/lua/entities/gmod_subway_81-721/init.lua +++ b/lua/entities/gmod_subway_81-721/init.lua @@ -97,16 +97,6 @@ function ENT:Initialize() Pos = Vector(-177, -66, -50), Radius = 20, }, } - self.Lights = { - -- Interior - --[11] = { "dynamiclight", Vector( 200, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400 , fov=180,farz = 128 - [15] = { "dynamiclight", Vector(-330, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.5, distance = 500, fov=180,farz = 128 }, - [16] = { "dynamiclight", Vector(-0, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.5, distance = 500, fov=180,farz = 128 }, - [17] = { "dynamiclight", Vector( 330, 0, 10), Angle(0,0,0), Color(238,238,197), brightness = 0.5, distance = 500, fov=180,farz = 128 }, - --[13] = { "dynamiclight", Vector(-200, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400 , fov=180,farz = 128 }, - --[11] = { "dynamiclight", Vector( 100, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400 , fov=180,farz = 128 }, - --[12] = { "dynamiclight", Vector( 100, 0, 10), Angle(0,0,0), Color(255,175,50), brightness = 3, distance = 400, fov=180,farz = 128 }, - } self.FrontDoor = false self.RearDoor = false end @@ -139,12 +129,7 @@ function ENT:Think() self:SetPackedBool("FrontDoor",self.FrontDoor) self:SetPackedBool("RearDoor",self.RearDoor) - local passlight = power and (self.BUV.MainLights and 1 or self.SFV20.Value > 0.5 and 0.4) or 0 - --self:SetLightPower(11,power and mul > 0, mul) - self:SetLightPower(15,passlight > 0, passlight) - self:SetLightPower(16,passlight > 0, passlight) - self:SetLightPower(17,passlight > 0, passlight) - self:SetPackedRatio("SalonLighting",passlight) + self:SetPackedRatio("SalonLighting",power and (self.BUV.MainLights and 1 or self.SFV20.Value > 0.5 and 0.4) or 0) --local mul = self.SF45.Value > 0.5 and self.BUV.MainLights and 1 or self.SF46.Value > 0.5 and 0.5 or 0 --self:SetLightPower(11,self.BUV.Power and mul > 0, mul) --self:SetLightPower(12,self.BUV.Power and mul > 0, mul) diff --git a/lua/entities/gmod_subway_81-722/cl_init.lua b/lua/entities/gmod_subway_81-722/cl_init.lua index ca4cb61..adedfc0 100644 --- a/lua/entities/gmod_subway_81-722/cl_init.lua +++ b/lua/entities/gmod_subway_81-722/cl_init.lua @@ -69,6 +69,7 @@ ENT.ButtonMap["PU1"] = { lcolor=Color(255,255,255),lz = 12,lbright=3,lfov=140,lfar=16,lnear=8,lshadows=0,}, sndvol = 0.2, snd = function(val) return val and "button_on" or "button_off" end, sndmin = 90, sndmax = 1e3, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(255,255,255),z=3} }}, {ID = "Zaglushka1",x=93.5+36*1, y=100-18*1+58*0,model = { model = "models/metrostroi_train/81-722/zaglushka.mdl", z=5, @@ -89,6 +90,7 @@ ENT.ButtonMap["PU1"] = { lcolor=Color(255,40,20),lz = 12,lbright=3,lfov=140,lfar=16,lnear=8,lshadows=0,}, sndvol = 0.2, snd = function(val) return val and "button_on" or "button_off" end, sndmin = 90, sndmax = 1e3, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(255,40,20),z=3}, tooltipFunc = function(ent) return ent:GetPackedBool("EmergencyDriveL") and Metrostroi.GetPhrase("Train.Buttons.AHActive") end }}, {ID = "MicrophoneSet",x=93.5+36*2, y=100-18*2+58*1, radius=15, tooltip = "Микрофон",model = { @@ -104,6 +106,7 @@ ENT.ButtonMap["PU1"] = { lcolor=Color(255,255,255),lz = 12,lbright=3,lfov=140,lfar=16,lnear=8,lshadows=0,}, sndvol = 0.2, snd = function(val) return val and "button_on" or "button_off" end, sndmin = 90, sndmax = 1e3, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(255,255,255),z=3} }}, } } @@ -207,6 +210,7 @@ ENT.ButtonMap["PU2"] = { lcolor=Color(255,255,255),lz = 12,lbright=3,lfov=140,lfar=16,lnear=8,lshadows=0,}, sndvol = 0.2, snd = function(val) return val and "button_on" or "button_off" end, sndmin = 90, sndmax = 1e3, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(255,255,255),z=3} }}, } } @@ -381,6 +385,7 @@ ENT.ButtonMap["PPZB"] = { lcolor=Color(60,255,40),lz = 12,lbright=3,lfov=130,lfar=16,lnear=8,lshadows=0,}, sndvol = 0.2, snd = function(val) return val and "button_on" or "button_off" end, sndmin = 90, sndmax = 1e3, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(60,255,40),z=3}, tooltipFunc = function(ent) return ent:GetPackedBool("BattOnL") and Metrostroi.GetPhrase("Train.Buttons.BattOn") end }}, {ID = "BattOffSet", x=24+40*2 , y=26 + 60*0, radius=20, tooltip="Отключение источника питания бортовой сети", model = { @@ -390,6 +395,7 @@ ENT.ButtonMap["PPZB"] = { lcolor=Color(255,255,60),lz = 12,lbright=3,lfov=130,lfar=16,lnear=8,lshadows=0,}, sndvol = 0.2, snd = function(val) return val and "button_on" or "button_off" end, sndmin = 90, sndmax = 1e3, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(255,255,60),z=3}, tooltipFunc = function(ent) return ent:GetPackedBool("BattOffL") and Metrostroi.GetPhrase("Train.Buttons.BattOff") end }}, {ID = "TorecDoorUnlockSet", x=24+40*0 , y=26 + 60*1, radius=20, tooltip="Разблокировка торцевых дверей", model = { @@ -406,7 +412,8 @@ ENT.ButtonMap["PPZB"] = { {ID = "SOSD", x=24+40*2 , y=26 + 60*1, radius=20, tooltip="СОСД", model = { model = "models/metrostroi_train/81-722/button_white.mdl", lamp = {model = "models/metrostroi_train/81-722/lamp_black.mdl",var="SOSDLamp", - lcolor=Color(255,255,255),lz = 12,lbright=3,lfov=130,lfar=16,lnear=8,lshadows=0} + lcolor=Color(255,255,255),lz = 12,lbright=3,lfov=130,lfar=16,lnear=8,lshadows=0}, + sprite = {bright=0.4,size=0.25,scale=0.03,vscale=0.02,color=Color(255,255,255),z=3} }}, } @@ -645,25 +652,61 @@ ENT.ButtonMap["Lighting"] = { } } ENT.ButtonMap["HelperLamps"] = { - pos = Vector(476,22.5,-12), - ang = Angle(0,-90,66), + pos = Vector(476,22.4,-12), + ang = Angle(0,-90,66.5), width = 125, height = 40, scale = 0.0625, buttons = { - {ID="!LRD",x=3, y=5,w=15,h=10, tooltip="ЛРД: Лампа разрешающая движение(разрешение движения под 0)"}, - {ID="!LPT",x=3+21*1, y=5,w=15,h=10, tooltip="ЛПТ: Лампа включение пневмотормоза"}, - {ID="!RS",x=3+21*2, y=5,w=15,h=10, tooltip="Р/С: Лампа аварийного питания радиостанции"}, - {ID="!AVS",x=3+21*3, y=5,w=15,h=10, tooltip="АВС Лампа низкого давления ТМ"}, - {ID="!LSD",x=3+21*4, y=5,w=15,h=10, tooltip="ЛСД: Лампа сигнализации закрытия дверей"}, - {ID="!RU",x=3+21*5, y=5,w=15,h=10, tooltip="РУ: Лампа выключения Реле Управления"}, + {ID="!LRD",x=0, y=5,w=15,h=10, tooltip="ЛРД: Лампа разрешающая движение(разрешение движения под 0)",model = { + name="lamp_lrd",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_lrd.mdl",z=7.7,ang=Angle(0,0,90),var="LampLRD"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(20,250,20),z=7.7} + }}, + {ID="!LPT",x=21*1, y=5,w=15,h=10, tooltip="ЛПТ: Лампа включение пневмотормоза",model = { + name="lamp_lpt",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_lpt.mdl",z=7.7,ang=Angle(0,0,90),var="LampLPT"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,250,20),z=7.7} + }}, + {ID="!RS",x=21*2, y=5,w=15,h=10, tooltip="Р/С: Лампа аварийного питания радиостанции",model = { + name="lamp_rc",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_rc.mdl",z=7.7,ang=Angle(0,0,90),var="LampRC"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,120,20),z=7.7} + }}, + {ID="!AVS",x=21*3, y=5,w=15,h=10, tooltip="АВС Лампа низкого давления ТМ",model = { + name="lamp_abc",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_abc.mdl",z=7.7,ang=Angle(0,0,90),var="LampAVS"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,120,20),z=7.7} + }}, + {ID="!LSD",x=21*4, y=5,w=15,h=10, tooltip="ЛСД: Лампа сигнализации закрытия дверей",model = { + name="lamp_lsd",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_lsd.mdl",z=7.7,ang=Angle(0,0,90),var="LampSD"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,250,250),z=7.7} + }}, + {ID="!RU",x=21*5, y=5,w=15,h=10, tooltip="РУ: Лампа выключения Реле Управления",model = { + name="lamp_ru",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_ru.mdl",z=7.7,ang=Angle(0,0,90),var="LampRU"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,120,20),z=7.7} + }}, - {ID="!04",x=3, y=23,w=15,h=10, tooltip="НЧ: Лампа отсутствия частоты (0км\\ч)"}, - {ID="!00",x=3+21*1, y=23,w=15,h=10, tooltip="0: Лампа ограничения в 0км\\ч"}, - {ID="!40",x=3+21*2, y=23,w=15,h=10, tooltip="40: Лампа ограничения в 40км\\ч"}, - {ID="!60",x=3+21*3, y=23,w=15,h=10, tooltip="60 Лампа ограничения в 60км\\ч"}, - {ID="!70",x=3+21*4, y=23,w=15,h=10, tooltip="70: Лампа ограничения в 70км\\ч"}, - {ID="!80",x=3+21*5, y=23,w=15,h=10, tooltip="80: Лампа ограничения в 80км\\ч"}, + {ID="!04",x=0, y=23,w=15,h=10, tooltip="НЧ: Лампа отсутствия частоты (0км\\ч)",model = { + name="lamp_nch",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_nch.mdl",z=7.7,ang=Angle(0,0,90),var="Lamp04"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,120,20),z=7.7} + }}, + {ID="!00",x=21*1, y=23,w=15,h=10, tooltip="0: Лампа ограничения в 0км\\ч",model = { + name="lamp_0",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_0.mdl",z=7.7,ang=Angle(0,0,90),var="Lamp0"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,120,20),z=7.7} + }}, + {ID="!40",x=21*2, y=23,w=15,h=10, tooltip="40: Лампа ограничения в 40км\\ч",model = { + name="lamp_40",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_40.mdl",z=7.7,ang=Angle(0,0,90),var="Lamp40"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(250,250,20),z=7.7} + }}, + {ID="!60",x=21*3, y=23,w=15,h=10, tooltip="60 Лампа ограничения в 60км\\ч",model = { + name="lamp_60",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_60.mdl",z=7.7,ang=Angle(0,0,90),var="Lamp60"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(20,250,20),z=7.7} + }}, + {ID="!70",x=21*4, y=23,w=15,h=10, tooltip="70: Лампа ограничения в 70км\\ч",model = { + name="lamp_70",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_70.mdl",z=7.7,ang=Angle(0,0,90),var="Lamp70"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(20,250,20),z=7.7} + }}, + {ID="!80",x=21*5, y=23,w=15,h=10, tooltip="80: Лампа ограничения в 80км\\ч",model = { + name="lamp_80",lamp = {speed=10,model = "models/metrostroi_train/81-722/lamp_80.mdl",z=7.7,ang=Angle(0,0,90),var="Lamp80"}, + sprite = {bright=0.3,size=0.15,scale=0.03,vscale=0.02,color=Color(20,250,20),z=7.7} + }}, } } @@ -820,45 +863,6 @@ ENT.ClientProps["volt_hv"] = { ang = Angle(35,90.000000,90.000000), hideseat = 0.2, } - - -local models = { - "models/metrostroi_train/81-722/lamp_lrd.mdl", - "models/metrostroi_train/81-722/lamp_lpt.mdl", - "models/metrostroi_train/81-722/lamp_rc.mdl", - "models/metrostroi_train/81-722/lamp_abc.mdl", - "models/metrostroi_train/81-722/lamp_lsd.mdl", - "models/metrostroi_train/81-722/lamp_ru.mdl", - - "models/metrostroi_train/81-722/lamp_nch.mdl", - "models/metrostroi_train/81-722/lamp_0.mdl", - "models/metrostroi_train/81-722/lamp_40.mdl", - "models/metrostroi_train/81-722/lamp_60.mdl", - "models/metrostroi_train/81-722/lamp_70.mdl", - "models/metrostroi_train/81-722/lamp_80.mdl", -} - -for i,model in pairs(models) do - if not model then continue end - if i>6 then - i=i-6 - ENT.ClientProps[model:sub(32,-5)] = { - model=model, - pos = Vector(474.85,19.257429+2.6-(i-1)*1.3,-13.41), - ang = Angle(-67.4,0.000000,0.000000), - hideseat = 0.2, - } - else - ENT.ClientProps[model:sub(32,-5)] = { - model=model, - pos = Vector(475.29,19.257429+2.6-(i-1)*1.3,-12.41 ), - ang = Angle(-67.4,0.000000,0.000000), - hideseat = 0.2, - } - end -end - - ENT.ClientProps["salon"] = { model = "models/metrostroi_train/81-722/722_salon1.mdl", pos = Vector(0,0,0), @@ -1146,6 +1150,7 @@ ENT.ButtonMap["Vityaz"] = { z=-14, color=Color(175,250,20) }, + sprite = {bright=0.15,size=0.15,scale=0.03,vscale=0.02,color=Color(100,255,20),z=5} }}, } } @@ -1243,17 +1248,35 @@ ENT.ButtonMap["BMP"] = { } ENT.Lights = { -- Headlight glow - [1] = { "headlight", Vector(492,0,-37), Angle(0,0,0), Color(200,200,255), fov=90 ,brightness = 6, texture = "models/metrostroi_train/equipment/headlight2",shadows = 1,headlight=true}, - [3] = { "headlight", Vector(493+15,0,60), Angle(0,0,0), Color(255,10,0), fov=140 ,brightness = 2, farz=450,texture = "models/metrostroi_train/equipment/headlight2",shadows = 0,backlight=true}, - + [1] = { "headlight", Vector(492,0,-37), Angle(0,0,0), Color(200,200,255), fov=90 ,brightness = 6, texture = "models/metrostroi_train/equipment/headlight2",shadows = 1,headlight=true}, + [2] = { "headlight", Vector(493+15,0,60), Angle(0,0,0), Color(255,10,0), fov=140 ,brightness = 2, farz=450,texture = "models/metrostroi_train/equipment/headlight2",shadows = 0,backlight=true}, + [31] = { "light", Vector(493 , -60, -36), Angle(0,0,0), Color(200,255,255), brightness = 0.5, scale = 2.5, texture = "sprites/light_glow02.vmt" }, + [32] = { "light", Vector(493 , 62, -36), Angle(0,0,0), Color(200,255,255), brightness = 0.5, scale = 2.5, texture = "sprites/light_glow02.vmt" }, + [33] = { "light", Vector(490, -65, 15), Angle(0,0,0), Color(255,50,50), brightness = 0.2, scale = 4, texture = "sprites/light_glow02.vmt" }, + [34] = { "light", Vector(489, 60, 15), Angle(0,0,0), Color(255,50,50), brightness = 0.2, scale = 4, texture = "sprites/light_glow02.vmt" }, --SOSD - --[2] = { "headlight", Vector( 430, -60, -47), Angle(45,-90,0), Color(255,255,255), brightness = 0.5, distance = 400 , fov=120, shadows = 1 }, - [2] = { "headlight", Vector( 425,-65,-65), Angle(25,-90,0),Color(255,255,255),brightness = 0.5,distance = 400 ,fov=120,shadows = 1 }, - [11] = { "headlight", Vector(473.5,-9.71,-9.30), Angle(81,0,0), Color(200,110,20), farz = 8.6, nearz = 1, shadows = 1, brightness = 10.0, fov = 130}, - [12] = { "headlight", Vector(476.8,-7.04,-5.06), Angle(81,0,0), Color(200,110,20), farz = 8.6, nearz = 1, shadows = 1, brightness = 10.0, fov = 130}, - [13] = { "headlight", Vector(474.9,-3,-2.45), Angle(110,-13,0), Color(180,180,255), farz = 24.6, nearz = 2, shadows = 1, brightness = 1, fov = 172.99}, - [14] = { "headlight", Vector(471.9,30,-1.75), Angle(110,22,0), Color(180,180,255), farz =26.9, nearz = 2, shadows = 1, brightness = 2, fov = 171.99}, - --[2] = { "dynamiclight", Vector( 300, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 4, distance = 550 }, + [3] = { "headlight", Vector( 425,-65,-65), Angle(25,-90,0),Color(255,255,255),brightness = 0.5,distance = 400 ,fov=120,shadows = 1 }, + -- Cabin + [10] = { "dynamiclight",Vector( 440, 0, 14), Angle(0,0,0), Color(255,255,255), brightness = 0.25, distance = 550 }, + -- Interior + [11] = { "dynamiclight",Vector( 180+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + [12] = { "dynamiclight",Vector( -50+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + [13] = { "dynamiclight",Vector(-280+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + -- Console + [14] = { "headlight", Vector(473.5,-9.71,-9.30), Angle(81,0,0), Color(200,110,20), farz = 8.6, nearz = 1, shadows = 1, brightness = 10.0, fov = 130}, + [15] = { "headlight", Vector(476.8,-7.04,-5.06), Angle(81,0,0), Color(200,110,20), farz = 8.6, nearz = 1, shadows = 1, brightness = 10.0, fov = 130}, + [16] = { "headlight", Vector(474.9,-3,-2.45), Angle(110,-13,0), Color(180,180,255), farz = 24.6, nearz = 2, shadows = 1, brightness = 1, fov = 172.99}, + [17] = { "headlight", Vector(471.9,30,-1.75), Angle(110,22,0), Color(180,180,255), farz =26.9, nearz = 2, shadows = 1, brightness = 2, fov = 171.99}, + -- Side lights + [20] = { "light", Vector(-46.4, 66,28.1)+Vector(0, 0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [21] = { "light", Vector(-46.4, 66,28.1)+Vector(0, 0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [22] = { "light", Vector(-46.4, 66,28.1)+Vector(0, 0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + + [23] = { "light", Vector(-46.4,-66,28.1)+Vector(0,-0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [24] = { "light", Vector(-46.4,-66,28.1)+Vector(0,-0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [25] = { "light", Vector(-46.4,-66,28.1)+Vector(0,-0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + lamps_cab_e = {"light", Vector(444,-42.4,46), Angle(0,0,0),Color(255,255,255),brightness = 0.4, scale = 0.8, texture = "sprites/light_glow02", hidden="lamps_cab_e"}, + lamps_cab_f = {"light", Vector(444, 42.4,46), Angle(0,0,0),Color(255,255,255),brightness = 0.4, scale = 0.8, texture = "sprites/light_glow02", hidden="lamps_cab_f"}, } function ENT:Initialize() self.BaseClass.Initialize(self) @@ -1334,8 +1357,14 @@ function ENT:Think() self.PassSchemesDone=false self.InvertSchemes = self:GetNW2Bool("SarmatInvert",false) end - self:SetLightPower(1,self:GetPackedRatio("Headlight")>0,self:GetPackedRatio("Headlight")) - self:SetLightPower(3,self:GetPackedBool("RedLights")) + + local Headlight = self:GetPackedRatio("Headlight") + self:SetLightPower(1,Headlight>0,Headlight) + self:SetLightPower(31,Headlight>0,Headlight) + self:SetLightPower(32,Headlight>0,Headlight) + self:SetLightPower(2,self:GetPackedBool("RedLights")) + self:SetLightPower(33,self:GetPackedBool("RedLights")) + self:SetLightPower(34,self:GetPackedBool("RedLights")) if IsValid(self.GlowingLights[1]) then if self:GetPackedRatio("Headlights") < 1 and self.GlowingLights[1]:GetFarZ() ~= 7000 then self.GlowingLights[1]:SetFarZ(7000) @@ -1344,12 +1373,33 @@ function ENT:Think() self.GlowingLights[1]:SetFarZ(8192) end end - self:SetLightPower(2,self:GetPackedBool("SOSD")) - self:SetLightPower(11,self:GetPackedBool("PanelLighting")) - self:SetLightPower(12,self:GetPackedBool("PanelLighting")) - self:SetLightPower(13,self:GetPackedBool("PanelLighting")) + self:SetLightPower(3,self:GetPackedBool("SOSD")) + local cablight = self:GetPackedRatio("CabLights") + self:SetLightPower(10,cablight>0,cablight) + self:SetLightPower("lamps_cab_e",cablight>0,cablight) + self:SetLightPower("lamps_cab_f",cablight>0.3,cablight) + + local passlight = self:GetPackedRatio("SalonLighting") + self:SetLightPower(11,passlight>0,passlight) + self:SetLightPower(12,passlight>0,passlight) + self:SetLightPower(13,passlight>0,passlight) + self:SetLightPower(14,self:GetPackedBool("PanelLighting")) - --self:ShowHideSmooth("led",self:Animate("PanelLighting",self:GetPackedBool("PanelLighting") and 1 or 0,0,1,16,false)) + self:SetLightPower(15,self:GetPackedBool("PanelLighting")) + self:SetLightPower(16,self:GetPackedBool("PanelLighting")) + self:SetLightPower(17,self:GetPackedBool("PanelLighting")) + + local BortLSD,BortPneumo,BortBV = self:GetPackedBool("BortLSD"),self:GetPackedBool("BortPneumo"),self:GetPackedBool("BortBV") + self:ShowHide("bortlamp_lsd",BortLSD) + self:ShowHide("bortlamp_pneumo",BortPneumo) + self:ShowHide("bortlamp_bv",BortBV) + self:SetLightPower(20,BortLSD,1) + self:SetLightPower(23,BortLSD,1) + self:SetLightPower(21,BortPneumo,1) + self:SetLightPower(24,BortPneumo,1) + self:SetLightPower(22,BortBV,1) + self:SetLightPower(25,BortBV,1) + self:ShowHide("led",self:GetPackedBool("PanelLighting")) --ANIMS self:Animate("brake_line", self:GetPackedRatio("BLPressure"), 0.037, 0.795, 256,2) @@ -1377,31 +1427,14 @@ function ENT:Think() self:ShowHide("RedLights",self:GetPackedBool("RedLights")) - self:ShowHide("bortlamp_pneumo",self:GetPackedBool("BortPneumo")) - self:ShowHide("bortlamp_lsd",self:GetPackedBool("BortLSD")) - self:ShowHide("bortlamp_bv",self:GetPackedBool("BortBV")) - self:ShowHideSmooth("lamps_salon",self:GetPackedRatio("SalonLighting")) - self:ShowHide("lamps_cab_e",self:GetPackedBool("CabinEnabledEmer")) - self:ShowHide("lamps_cab_f",self:GetPackedBool("CabinEnabledFull")) + self:ShowHide("lamps_cab_e",cablight>0) + self:ShowHide("lamps_cab_f",cablight>0.3) self:ShowHide("doorl_l",self:GetPackedBool("DoorAlarmL")) self:ShowHide("doorl_r",self:GetPackedBool("DoorAlarmR")) --Радио self:ShowHide("rvs",self:GetPackedBool("RadioRVS")) - --rvs - self:ShowHideSmooth("lamp_lrd",self:Animate("lamplrd",self:GetPackedBool("LampLRD") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_lpt",self:Animate("lamplpt",self:GetPackedBool("LampLPT") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_rc",self:Animate("lamprc",self:GetPackedBool("LampRC") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_abc",self:Animate("lampavs",self:GetPackedBool("LampAVS") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_lsd",self:Animate("lamplsd",self:GetPackedBool("LampSD") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_ru",self:Animate("lampru",self:GetPackedBool("LampRU") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_nch",self:Animate("lampnch",self:GetPackedBool("Lamp04") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_0",self:Animate("lamp0",self:GetPackedBool("Lamp0") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_40",self:Animate("lamp40",self:GetPackedBool("Lamp40") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_60",self:Animate("lamp60",self:GetPackedBool("Lamp60") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_70",self:Animate("lamp70",self:GetPackedBool("Lamp70") and 1 or 0,0,1,10,false)) - self:ShowHideSmooth("lamp_80",self:Animate("lamp80",self:GetPackedBool("Lamp80") and 1 or 0,0,1,10,false)) self:Animate("RearBrake", self:GetNW2Bool("RbI") and 0 or 1,0,1, 3, false) self:Animate("RearTrain", self:GetNW2Bool("RtI") and 1 or 0,0,1, 3, false) diff --git a/lua/entities/gmod_subway_81-722/init.lua b/lua/entities/gmod_subway_81-722/init.lua index feb1b6b..10c7790 100644 --- a/lua/entities/gmod_subway_81-722/init.lua +++ b/lua/entities/gmod_subway_81-722/init.lua @@ -184,26 +184,6 @@ function ENT:Initialize() }, } - self.Lights = { - [1] = { "light", Vector(493 , -60, -36), Angle(0,0,0), Color(200,255,255), brightness = 0.5, scale = 2.5, texture = "sprites/light_glow02.vmt" }, - [2] = { "light", Vector(493 , 62, -36), Angle(0,0,0), Color(200,255,255), brightness = 0.5, scale = 2.5, texture = "sprites/light_glow02.vmt" }, - [3] = { "light", Vector(490, -65, 15), Angle(0,0,0), Color(255,50,50), brightness = 0.2, scale = 4, texture = "sprites/light_glow02.vmt" }, - [4] = { "light", Vector(489, 60, 15), Angle(0,0,0), Color(255,50,50), brightness = 0.2, scale = 4, texture = "sprites/light_glow02.vmt" }, - [10] = { "dynamiclight", Vector( 440, 0, 14), Angle(0,0,0), Color(255,255,255), brightness = 0.25, distance = 550 }, - -- Interior - [11] = { "dynamiclight", Vector( 180+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - [12] = { "dynamiclight", Vector( -50+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - [13] = { "dynamiclight", Vector(-280+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - - [15] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [16] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [17] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [18] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [19] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [20] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - - } - self.PassengerDoor = false self.CabinDoorLeft = false self.CabinDoorRight = false @@ -248,7 +228,6 @@ function ENT:Think() end end end - --[[ self.TestA = self.TestA or nil self.TestV = self.TestV or nil local accel = self.Acceleration @@ -323,28 +302,14 @@ function ENT:Think() self:SetPackedBool("Lamp70",self.ALSCoil.F2 > 0) self:SetPackedBool("Lamp80",self.ALSCoil.F1 > 0) - local cablight = self.Panel.CabLights - self:SetLightPower(10,cablight > 0,cablight) - self:SetPackedBool("CabinEnabledEmer", cablight > 0) - self:SetPackedBool("CabinEnabledFull", cablight > 0.3) + self:SetPackedRatio("CabLights",self.Panel.CabLights==0.5 and 0.3 or self.Panel.CabLights) self:SetPackedBool("PanelLighting",self.Panel.PanelLights>0) - local HeadlightsPower = self.Panel.Headlights2 > 0 and 1 or self.Panel.Headlights1 > 0 and 0.5 or 0 self:SetPackedBool("Headlights1",self.Panel.Headlights1 > 0) self:SetPackedBool("Headlights2",self.Panel.Headlights2 > 0) - - self:SetLightPower(1,HeadlightsPower > 0,HeadlightsPower^0.5) - self:SetLightPower(2,HeadlightsPower > 0,HeadlightsPower^0.5) - self:SetPackedRatio("Headlight",HeadlightsPower) + self:SetPackedRatio("Headlight",self.Panel.Headlights2 > 0 and 1 or self.Panel.Headlights1 > 0 and 0.5 or 0) self:SetPackedBool("RedLights",self.Panel.RedLights>0) - self:SetLightPower(3,self.Panel.RedLights>0) - self:SetLightPower(4,self.Panel.RedLights>0) - local passlight = math.min(1,self.Panel.MainLights+self.Panel.EmergencyLights*0.3) - --self:SetLightPower(11,power and mul > 0, mul) - self:SetLightPower(11,passlight > 0, passlight) - self:SetLightPower(12,passlight > 0, passlight) - self:SetLightPower(13,passlight > 0, passlight) - self:SetPackedRatio("SalonLighting",passlight) + self:SetPackedRatio("SalonLighting",math.min(1,self.Panel.MainLights+self.Panel.EmergencyLights*0.3)) self:SetPackedBool("CompressorWork",self.Pneumatic.Compressor) @@ -364,17 +329,10 @@ function ENT:Think() self:SetPackedBool("SOSD",self.Panel.SOSD>0) self:SetPackedBool("SOSDLamp",self.BUKP.SOSD>0) self.SOSD = self.Panel.SOSD>0 - - + self:SetPackedBool("BortPneumo",self.Panel.BrW>0) self:SetPackedBool("BortLSD",self.Panel.DoorsW>0) self:SetPackedBool("BortBV",self.Panel.GRP>0) - self:SetLightPower(15, self.Panel.DoorsW > 0.5,1) - self:SetLightPower(18, self.Panel.DoorsW > 0.5,1) - self:SetLightPower(16, self.Panel.BrW > 0.5,1) - self:SetLightPower(19, self.Panel.BrW > 0.5,1) - self:SetLightPower(17, self.Panel.GRP > 0.5,1) - self:SetLightPower(20, self.Panel.GRP > 0.5,1) self:SetPackedBool("RingEnabled",self.BUKP.Ring) self:SetPackedBool("RingEnabledBARS",self.BARS.Ring>0) diff --git a/lua/entities/gmod_subway_81-723/cl_init.lua b/lua/entities/gmod_subway_81-723/cl_init.lua index f75a154..060255e 100644 --- a/lua/entities/gmod_subway_81-723/cl_init.lua +++ b/lua/entities/gmod_subway_81-723/cl_init.lua @@ -425,8 +425,19 @@ ENT.ClientProps["otsek4"] = { } ENT.Lights = { - -- Headlight glow - --[2] = { "dynamiclight", Vector( 300, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 4, distance = 550 }, + [10] = { "dynamiclight", Vector( 430, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 0.05, distance = 550 }, + + -- Interior + [11] = { "dynamiclight", Vector( 180+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + [12] = { "dynamiclight", Vector( -50+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + [13] = { "dynamiclight", Vector(-280+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + + [15] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [16] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [17] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [18] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [19] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [20] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, } ENT.ButtonMap["Tickers1"] = { @@ -523,10 +534,22 @@ function ENT:Think() self.PassSchemesDone=false self.InvertSchemes = self:GetNW2Bool("SarmatInvert",false) end + + local passlight = self:GetPackedRatio("SalonLighting") + self:SetLightPower(11,passlight > 0, passlight) + self:SetLightPower(12,passlight > 0, passlight) + self:SetLightPower(13,passlight > 0, passlight) - self:ShowHide("bortlamp_pneumo",self:GetPackedBool("BortPneumo")) - self:ShowHide("bortlamp_lsd",self:GetPackedBool("BortLSD")) - self:ShowHide("bortlamp_bv",self:GetPackedBool("BortBV")) + local BortLSD,BortPneumo,BortBV = self:GetPackedBool("BortLSD"),self:GetPackedBool("BortPneumo"),self:GetPackedBool("BortBV") + self:ShowHide("bortlamp_lsd",BortLSD) + self:ShowHide("bortlamp_pneumo",BortPneumo) + self:ShowHide("bortlamp_bv",BortBV) + self:SetLightPower(15,BortLSD,1) + self:SetLightPower(18,BortLSD,1) + self:SetLightPower(16,BortPneumo,1) + self:SetLightPower(19,BortPneumo,1) + self:SetLightPower(17,BortBV,1) + self:SetLightPower(20,BortBV,1) self:ShowHideSmooth("lamps_salon",self:GetPackedRatio("SalonLighting")) self:ShowHide("doorl_l",self:GetPackedBool("DoorAlarmL")) diff --git a/lua/entities/gmod_subway_81-723/init.lua b/lua/entities/gmod_subway_81-723/init.lua index 26fa3dd..8b3c517 100644 --- a/lua/entities/gmod_subway_81-723/init.lua +++ b/lua/entities/gmod_subway_81-723/init.lua @@ -87,22 +87,7 @@ function ENT:Initialize() Pos = Vector(457.8, 36, 0), Radius = 20, }, } - - self.Lights = { - [10] = { "dynamiclight", Vector( 430, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 0.05, distance = 550 }, - - -- Interior - [11] = { "dynamiclight", Vector( 180+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - [12] = { "dynamiclight", Vector( -50+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - [13] = { "dynamiclight", Vector(-280+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - - [15] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [16] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [17] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [18] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [19] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [20] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.8,-4.1), Angle(0,0,0), Color(40,240,122), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - } + self.FrontDoor = false self.RearDoor = false @@ -126,11 +111,7 @@ function ENT:Think() self:SetPackedRatio("chopper", math.Clamp(self.Electric.Chopper>0 and self.Electric.Iexit/100 or 0,0,1)) self:SetPackedRatio("Speed", self.Speed) - local passlight = math.min(1,self.Panel.MainLights+self.Panel.EmergencyLights*0.3) - --self:SetLightPower(11,power and mul > 0, mul) - self:SetLightPower(11,passlight > 0, passlight) - self:SetLightPower(12,passlight > 0, passlight) - self:SetLightPower(13,passlight > 0, passlight) + self:SetPackedRatio("SalonLighting",math.min(1,self.Panel.MainLights+self.Panel.EmergencyLights*0.3)) --self:SetPackedBool("BattPressed",self.BUKV.BatteryPressed) @@ -153,14 +134,6 @@ function ENT:Think() self:SetPackedBool("BortPneumo",self.Panel.BrW>0) self:SetPackedBool("BortLSD",self.Panel.DoorsW>0) self:SetPackedBool("BortBV",self.Panel.GRP>0) - self:SetLightPower(15, self.Panel.DoorsW > 0.5,1) - self:SetLightPower(18, self.Panel.DoorsW > 0.5,1) - self:SetLightPower(16, self.Panel.BrW > 0.5,1) - self:SetLightPower(19, self.Panel.BrW > 0.5,1) - self:SetLightPower(17, self.Panel.GRP > 0.5,1) - self:SetLightPower(20, self.Panel.GRP > 0.5,1) - - self:SetPackedRatio("SalonLighting",passlight) self:SetPackedBool("DoorAlarmL",self.BUKV.CloseRing) self:SetPackedBool("DoorAlarmR",self.BUKV.CloseRing) diff --git a/lua/entities/gmod_subway_81-724/cl_init.lua b/lua/entities/gmod_subway_81-724/cl_init.lua index 93d5ca5..1a800ac 100644 --- a/lua/entities/gmod_subway_81-724/cl_init.lua +++ b/lua/entities/gmod_subway_81-724/cl_init.lua @@ -424,10 +424,18 @@ ENT.ClientProps["otsek4"] = { hideseat=1.7, } ENT.Lights = { - -- Headlight glow - --[2] = { "dynamiclight", Vector( 300, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 4, distance = 550 }, -} + [10] = { "dynamiclight", Vector( 430, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 0.05, distance = 550 }, + -- Interior + [11] = { "dynamiclight", Vector( 180+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + [12] = { "dynamiclight", Vector( -50+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + [13] = { "dynamiclight", Vector(-280+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, + + [15] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [16] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [18] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, + [19] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, +} ENT.ButtonMap["Tickers1"] = { pos = Vector(-455.4,-11.1,52.8), ang = Angle(0,90,90), @@ -520,6 +528,19 @@ function ENT:Think() self.PassSchemesDone=false self.InvertSchemes = self:GetNW2Bool("SarmatInvert",false) end + + local passlight = self:GetPackedRatio("SalonLighting") + self:SetLightPower(11,passlight > 0, passlight) + self:SetLightPower(12,passlight > 0, passlight) + self:SetLightPower(13,passlight > 0, passlight) + + local BortLSD,BortPneumo,BortBV = self:GetPackedBool("BortLSD"),self:GetPackedBool("BortPneumo"),self:GetPackedBool("BortBV") + self:ShowHide("bortlamp_lsd",BortLSD) + self:ShowHide("bortlamp_pneumo",BortPneumo) + self:SetLightPower(15,BortLSD,1) + self:SetLightPower(18,BortLSD,1) + self:SetLightPower(16,BortPneumo,1) + self:SetLightPower(19,BortPneumo,1) self:ShowHide("bortlamp_pneumo",self:GetPackedBool("BortPneumo")) self:ShowHide("bortlamp_lsd",self:GetPackedBool("BortLSD")) diff --git a/lua/entities/gmod_subway_81-724/init.lua b/lua/entities/gmod_subway_81-724/init.lua index f96d3fa..ab0a1ba 100644 --- a/lua/entities/gmod_subway_81-724/init.lua +++ b/lua/entities/gmod_subway_81-724/init.lua @@ -88,19 +88,6 @@ function ENT:Initialize() [38] = 37, -- Doors L<->R } - self.Lights = { - [10] = { "dynamiclight", Vector( 430, 0, 40), Angle(0,0,0), Color(255,255,255), brightness = 0.05, distance = 550 }, - - -- Interior - [11] = { "dynamiclight", Vector( 180+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - [12] = { "dynamiclight", Vector( -50+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - [13] = { "dynamiclight", Vector(-280+30, 0, -5), Angle(0,0,0), Color(230,230,255), brightness = 3, distance = 260}, - - [15] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [16] = { "light",Vector(-46.4, 66,28.1)+Vector(0, 0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [18] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0,4.1), Angle(0,0,0), Color(254,254,254), brightness = 0.4, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - [19] = { "light",Vector(-46.4,-66,28.1)+Vector(0,-0.4,-0), Angle(0,0,0), Color(254,210,18), brightness = 0.3, scale = 0.1, texture = "sprites/light_glow02.vmt" }, - } self.FrontDoor = false self.RearDoor = false @@ -113,11 +100,7 @@ function ENT:Think() local retVal = self.BaseClass.Think(self) local power = self.BUKV.Power > 0 self:SetPackedRatio("Speed", self.Speed) - local passlight = math.min(1,self.Panel.MainLights+self.Panel.EmergencyLights*0.3) - --self:SetLightPower(11,power and mul > 0, mul) - self:SetLightPower(11,passlight > 0, passlight) - self:SetLightPower(12,passlight > 0, passlight) - self:SetLightPower(13,passlight > 0, passlight) + self:SetPackedRatio("SalonLighting",math.min(1,self.Panel.MainLights+self.Panel.EmergencyLights*0.3)) self:SetPackedBool("BattPressed",self.BUKV.BatteryPressed) @@ -137,12 +120,6 @@ function ENT:Think() self:SetPackedBool("BortPneumo",self.Panel.BrW>0) self:SetPackedBool("BortLSD",self.Panel.DoorsW>0) - self:SetLightPower(15, self.Panel.DoorsW > 0.5,1) - self:SetLightPower(18, self.Panel.DoorsW > 0.5,1) - self:SetLightPower(16, self.Panel.BrW > 0.5,1) - self:SetLightPower(19, self.Panel.BrW > 0.5,1) - - self:SetPackedRatio("SalonLighting",passlight) self:SetPackedBool("DoorAlarmL",self.BUKV.CloseRing) self:SetPackedBool("DoorAlarmR",self.BUKV.CloseRing)