From 5a58301de2993079f50b0367f5dd0fa3ae08873e Mon Sep 17 00:00:00 2001 From: kosmik641 Date: Fri, 3 Mar 2023 01:41:05 +0300 Subject: [PATCH] =?UTF-8?q?81-722.=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/entities/gmod_subway_81-722/cl_init.lua | 57 +++++++++++++------ lua/entities/gmod_subway_81-723/cl_init.lua | 30 +++++----- lua/entities/gmod_subway_81-724/cl_init.lua | 30 +++++----- lua/metrostroi/systems/sys_81_722_tickers.lua | 4 +- 4 files changed, 73 insertions(+), 48 deletions(-) diff --git a/lua/entities/gmod_subway_81-722/cl_init.lua b/lua/entities/gmod_subway_81-722/cl_init.lua index cb42ea4..94f4a03 100644 --- a/lua/entities/gmod_subway_81-722/cl_init.lua +++ b/lua/entities/gmod_subway_81-722/cl_init.lua @@ -1163,8 +1163,8 @@ ENT.ButtonMap["BMCIK"] = { scale = 0.0089, sensor = true, system = "BMCIK", - hideseat=0.2, - hide=true, + hideseat = 0.2, + hide = true } for i=1,3 do @@ -1196,24 +1196,47 @@ ENT.ButtonMap["TNM"] = { height = 115, scale = 0.06, - hide=2, + hide=2 } ENT.ButtonMap["BMTS"] = { - pos = Vector(473.8,-12.8,44.7), + pos = Vector(473.8,-11.85,45.2-0.5), ang = Angle(0,90,90), width = 512, height = 80, - scale = 0.1012, - - hide=2, + scale = 0.0975, + hide = 2 } -ENT.ButtonMap["BIT"] = { - pos = Vector(-455.4,-10.85,52.62), +ENT.ButtonMap["BIT1"] = { + pos = Vector(-455.37,-10.92504,52.35969), ang = Angle(0,90,90), width = 1024, height = 192, - scale = 0.0268, - hideseat = 1.5, + scale = 0.026947, + hideseat = 1.5 +} +ENT.ButtonMap["BIT2"] = { + pos = Vector(1.55365,-10.92493,51.99417), + ang = Angle(0,90,97), + width = 1024, + height = 192, + scale = 0.026947, + hideseat = 1.5 +} +ENT.ButtonMap["BIT3"] = { + pos = Vector(-4.83291,10.92509,51.99417), + ang = Angle(0,-90,97), + width = 1024, + height = 192, + scale = 0.026947, + hideseat = 1.5 +} +ENT.ButtonMap["BIT4"] = { + pos = Vector(377.70719,16.66898,52.35969), + ang = Angle(0,-90,90), + width = 1024, + height = 192, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["SarmatButtons"] = { pos = Vector(476.2,30.2,-6.4), @@ -1762,12 +1785,14 @@ function ENT:DrawPost() surface.DrawTexturedRectRotated(256,64,512,128,0) end) self.RTMaterial:SetTexture("$basetexture", self.BITScr) - self:DrawOnPanel("BIT",function(...) - surface.SetMaterial(self.RTMaterial) - surface.SetDrawColor(255,255,255,200) - surface.DrawTexturedRectRotated(512,128,1024,256,0) - end) + surface.SetDrawColor(255,255,255,200) + for i=1,4 do + self:DrawOnPanel("BIT"..i,function(...) + surface.DrawTexturedRectRotated(512,128,1024,256,0) + end) + end self.RTMaterial:SetTexture("$basetexture", self.TNMScr) + surface.SetDrawColor(255,255,255) self:DrawOnPanel("TNM",function(...) surface.SetMaterial(self.RTMaterial) surface.SetDrawColor(255,255,255) diff --git a/lua/entities/gmod_subway_81-723/cl_init.lua b/lua/entities/gmod_subway_81-723/cl_init.lua index 9754df3..ae4de59 100644 --- a/lua/entities/gmod_subway_81-723/cl_init.lua +++ b/lua/entities/gmod_subway_81-723/cl_init.lua @@ -441,36 +441,36 @@ ENT.Lights = { } ENT.ButtonMap["BIT1"] = { - pos = Vector(-455.4,-10.85,52.62), + pos = Vector(-455.75,-10.92504,52.35969), ang = Angle(0,90,90), width = 1024, height = 192, - scale = 0.0268, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["BIT2"] = { - pos = Vector(1.8,-11,52.35), - ang = Angle(0,90,90+9), + pos = Vector(1.55365,-10.92493,51.99417), + ang = Angle(0,90,97), width = 1024, height = 192, - scale = 0.02684+0.0003, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["BIT3"] = { - pos = Vector(-5,11,52.35), - ang = Angle(0,-90,90+9), + pos = Vector(-4.83291,10.92509,51.99417), + ang = Angle(0,-90,97), width = 1024, height = 192, - scale = 0.02684+0.0003, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["BIT4"] = { - pos = Vector(449.3,10.85,52.62), + pos = Vector(449.44,10.92504,52.35969), ang = Angle(0,-90,90), width = 1024, height = 192, - scale = 0.0268, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } function ENT:Initialize() self.BaseClass.Initialize(self) @@ -791,7 +791,7 @@ end function ENT:DrawPost() self.RTMaterial:SetTexture("$basetexture", self.BITScr) surface.SetMaterial(self.RTMaterial) - surface.SetDrawColor(255,255,255) + surface.SetDrawColor(255,255,255,200) for i=1,4 do self:DrawOnPanel("BIT"..i,function(...) surface.DrawTexturedRectRotated(512,128,1024,256,0) diff --git a/lua/entities/gmod_subway_81-724/cl_init.lua b/lua/entities/gmod_subway_81-724/cl_init.lua index cf94302..355bbc1 100644 --- a/lua/entities/gmod_subway_81-724/cl_init.lua +++ b/lua/entities/gmod_subway_81-724/cl_init.lua @@ -437,36 +437,36 @@ ENT.Lights = { [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["BIT1"] = { - pos = Vector(-455.4,-10.85,52.62), + pos = Vector(-455.75,-10.92504,52.35969), ang = Angle(0,90,90), width = 1024, height = 192, - scale = 0.0268, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["BIT2"] = { - pos = Vector(1.8,-11,52.35), - ang = Angle(0,90,90+9), + pos = Vector(1.55365,-10.92493,51.99417), + ang = Angle(0,90,97), width = 1024, height = 192, - scale = 0.02684+0.0003, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["BIT3"] = { - pos = Vector(-5,11,52.35), - ang = Angle(0,-90,90+9), + pos = Vector(-4.83291,10.92509,51.99417), + ang = Angle(0,-90,97), width = 1024, height = 192, - scale = 0.02684+0.0003, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } ENT.ButtonMap["BIT4"] = { - pos = Vector(449.3,10.85,52.62), + pos = Vector(449.44,10.92504,52.35969), ang = Angle(0,-90,90), width = 1024, height = 192, - scale = 0.0268, - hideseat=1.5, + scale = 0.026947, + hideseat = 1.5 } function ENT:Initialize() self.BaseClass.Initialize(self) @@ -754,7 +754,7 @@ end function ENT:DrawPost() self.RTMaterial:SetTexture("$basetexture", self.BITScr) surface.SetMaterial(self.RTMaterial) - surface.SetDrawColor(255,255,255) + surface.SetDrawColor(255,255,255,200) for i=1,4 do self:DrawOnPanel("BIT"..i,function(...) surface.DrawTexturedRectRotated(512,128,1024,256,0) diff --git a/lua/metrostroi/systems/sys_81_722_tickers.lua b/lua/metrostroi/systems/sys_81_722_tickers.lua index 808d1cd..018736c 100644 --- a/lua/metrostroi/systems/sys_81_722_tickers.lua +++ b/lua/metrostroi/systems/sys_81_722_tickers.lua @@ -194,7 +194,7 @@ else function TRAIN_SYSTEM:ClientInitialize() end function TRAIN_SYSTEM:ClientThink() - if not self.Train:ShouldDrawPanel("BIT") then return end + if not self.Train:ShouldDrawPanel("BIT1") then return end render.PushRenderTarget(self.Train.BITScr,0,0,1024, 256) render.Clear(0, 0, 0, 0) cam.Start2D() @@ -215,7 +215,7 @@ else function TRAIN_SYSTEM:BIT(Train) local state = Train:GetNW2Int("BIT:State",0) if state == 0 then return end - surface.SetDrawColor(20,10,20,255) + surface.SetDrawColor(20,10,20) surface.DrawRect(0,0,1024,192) if state > 0 then