From 22bdd7eb3e27ee7dc543395716d434d3751c8ab8 Mon Sep 17 00:00:00 2001 From: CrIcKeT Date: Sat, 13 Aug 2022 18:51:30 +0300 Subject: [PATCH 1/7] Added window decals --- models/metrostroi_train/81-502/ema_salon_501.dx80.vtx | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.dx90.vtx | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.mdl | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.sw.vtx | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.vvd | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx b/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx index 2f41e1a..c44ec6e 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx +++ b/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15805b5d08bc68541b59cc76a44b76e84a5577274994f81c21e36cc917be6dbf -size 842372 +oid sha256:df2fb047fd1fa80b1aa16acc9f19a8aa4990c1644657691523ef484447bea735 +size 842147 diff --git a/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx b/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx index 988c8ee..da1c8c2 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx +++ b/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc5e62e7b23fe90157654db33cfbf56148551150048dff4a7cbbe3ead2638eb -size 842372 +oid sha256:f5752b774c217220947b7c110f23ee76a1ce9b0dbf38e57d5600d906b3b90315 +size 842147 diff --git a/models/metrostroi_train/81-502/ema_salon_501.mdl b/models/metrostroi_train/81-502/ema_salon_501.mdl index d5c70d5..261e0e7 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.mdl +++ b/models/metrostroi_train/81-502/ema_salon_501.mdl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48fc08a3cd5df1f3f74bb0bea66dace3a2aa60bebb2c6f44b4c9db359120b6cd -size 2152 +oid sha256:e568882c13b2b44b8a09a60e9c55750919222e13810afce7762ede8c9470e5e3 +size 2172 diff --git a/models/metrostroi_train/81-502/ema_salon_501.sw.vtx b/models/metrostroi_train/81-502/ema_salon_501.sw.vtx index 10f35b3..3e772e3 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.sw.vtx +++ b/models/metrostroi_train/81-502/ema_salon_501.sw.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4511de83ded7614d37c17eec2c9eb17b155df8d7fc67248a385d39163914bfea -size 842348 +oid sha256:fcc596546d123a77ed2f71c8919ca6ce3c5ce5cb8f3242f0d9577a8d4b9d386e +size 842123 diff --git a/models/metrostroi_train/81-502/ema_salon_501.vvd b/models/metrostroi_train/81-502/ema_salon_501.vvd index 2a12b46..db0bc2e 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.vvd +++ b/models/metrostroi_train/81-502/ema_salon_501.vvd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d130ab3039177df74a992550896b621a0ba52b7024de2b6ad490103840da8836 -size 3351408 +oid sha256:ce4dd7baad8ffe348223ec4e80be038b50d6699f026b47fc123be8e9b4666a7e +size 3349808 From 8d1c1c521c49f1bd92ecf3fed7bdec5f0706cd1c Mon Sep 17 00:00:00 2001 From: CrIcKeT Date: Sat, 13 Aug 2022 19:08:05 +0300 Subject: [PATCH 2/7] Add fix material ID --- models/metrostroi_train/81-502/ema_salon_501.dx80.vtx | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.dx90.vtx | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.mdl | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.sw.vtx | 4 ++-- models/metrostroi_train/81-502/ema_salon_501.vvd | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx b/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx index c44ec6e..dbbeb15 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx +++ b/models/metrostroi_train/81-502/ema_salon_501.dx80.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df2fb047fd1fa80b1aa16acc9f19a8aa4990c1644657691523ef484447bea735 -size 842147 +oid sha256:90d6ae8d4f95a8d397d829b395cf86adcae4c1a4a27cb399bf14bbe981370e0f +size 842225 diff --git a/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx b/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx index da1c8c2..fbb2863 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx +++ b/models/metrostroi_train/81-502/ema_salon_501.dx90.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5752b774c217220947b7c110f23ee76a1ce9b0dbf38e57d5600d906b3b90315 -size 842147 +oid sha256:a70ff0bf3e3887b45a837fffcd495a4901fa981e720ee23349910512e75311ea +size 842225 diff --git a/models/metrostroi_train/81-502/ema_salon_501.mdl b/models/metrostroi_train/81-502/ema_salon_501.mdl index 261e0e7..19a075e 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.mdl +++ b/models/metrostroi_train/81-502/ema_salon_501.mdl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e568882c13b2b44b8a09a60e9c55750919222e13810afce7762ede8c9470e5e3 -size 2172 +oid sha256:3cc554a25074893099edf759a4628ab6987ad181c51b6cc84c3c6abcef3a49ed +size 2360 diff --git a/models/metrostroi_train/81-502/ema_salon_501.sw.vtx b/models/metrostroi_train/81-502/ema_salon_501.sw.vtx index 3e772e3..21a37dd 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.sw.vtx +++ b/models/metrostroi_train/81-502/ema_salon_501.sw.vtx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcc596546d123a77ed2f71c8919ca6ce3c5ce5cb8f3242f0d9577a8d4b9d386e -size 842123 +oid sha256:e81e94b1d33c0e4ca55d4687a892900d6051c0df4040158a194c32c52f836dc3 +size 842193 diff --git a/models/metrostroi_train/81-502/ema_salon_501.vvd b/models/metrostroi_train/81-502/ema_salon_501.vvd index db0bc2e..f53b165 100644 --- a/models/metrostroi_train/81-502/ema_salon_501.vvd +++ b/models/metrostroi_train/81-502/ema_salon_501.vvd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce4dd7baad8ffe348223ec4e80be038b50d6699f026b47fc123be8e9b4666a7e +oid sha256:af064b35e1a6ee2f1355a8aa7cea64ec4fc5d4038b5a36d83ae16bdd3e5caf9f size 3349808 From b2204f953ed63fe1b7af5c601a6b850d2c7dd83f Mon Sep 17 00:00:00 2001 From: Andrey Stalker Date: Fri, 24 Nov 2023 12:55:31 +0300 Subject: [PATCH 3/7] Fix station name --- lua/metrostroi/maps/loopline.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/metrostroi/maps/loopline.lua b/lua/metrostroi/maps/loopline.lua index f5fea73..f1984f3 100644 --- a/lua/metrostroi/maps/loopline.lua +++ b/lua/metrostroi/maps/loopline.lua @@ -571,9 +571,9 @@ Metrostroi.StationConfigurations = { } }, pto = { - pto = {"пто","ПТО"}, + names = {"пто","ПТО"}, positions = { {Vector(-4539,5624,-4597),Angle(0,0,0)}, } } -} \ No newline at end of file +} From d6143b611f8dc458d6bd3660fa2bae3e0d1bc9b6 Mon Sep 17 00:00:00 2001 From: Pollitto Date: Tue, 5 Dec 2023 15:56:54 +0300 Subject: [PATCH 4/7] Update vc-2010 redist URL --- lua/autorun/metrostroi.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/autorun/metrostroi.lua b/lua/autorun/metrostroi.lua index 5f98fff..a0e8ddf 100644 --- a/lua/autorun/metrostroi.lua +++ b/lua/autorun/metrostroi.lua @@ -354,7 +354,7 @@ if SERVER then if not pcall(require,"turbostroi") then if system.IsWindows() then ErrorNoHalt("======================================================\nMetrostroi: Turbostroi library can't be loaded because of missing libraries!\nCheck, that you have Microsoft visual c++ 2010 and 2017 redistributable(x86) installed\nYou can download it from:\n") - MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe\n") + MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=26999 (2010 x86)\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe (2017 x86)\n") ErrorNoHalt("======================================================\n") else ErrorNoHalt("Metrostroi: Turbostroi library can't be loaded!\n") @@ -366,7 +366,7 @@ if SERVER then if not pcall(require,"turbostroi") then if system.IsWindows() then ErrorNoHalt("======================================================\nMetrostroi: Turbostroi library can't be loaded because of missing libraries!\nCheck, that you have Microsoft visual c++ 2010 and 2017 redistributable(x64) installed\nYou can download it from:\n") - MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x64.exe\n") + MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=26999 (2010 x64)\nhttps://aka.ms/vs/15/release/vc_redist.x64.exe (2017 x64)\n") ErrorNoHalt("======================================================\n") else ErrorNoHalt("Metrostroi: Turbostroi library can't be loaded!\n") @@ -378,7 +378,7 @@ if SERVER then ErrorNoHalt("======================================================\nMetrostroi: Turbostroi DLL not found.\nYou can found turbostroi for Windows at \n") MsgC(Color(255,0,0),"https://metrostroi.net/turbostroi\n") ErrorNoHalt("Just place this .dll to garrysmod/lua/bin folder.\nIf bin folder doesn't exists - create it.\nDon't forget to install Microsoft visual c++ 2010 and 2017 redistributable(x86)\nYou can download it from:\n") - MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe\n") + MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=26999 (2010 x86)\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe (2017 x86)\n") ErrorNoHalt("======================================================\n") else ErrorNoHalt("Metrostroi: Turbostroi DLL not found.\n") From 50cbc1b31ec9079f09664c714842ffc12e0aab2b Mon Sep 17 00:00:00 2001 From: Anton Shukin Date: Sun, 11 Feb 2024 18:13:19 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B5=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF=D0=BE=D0=B4=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=83=D0=B4=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/entities/gmod_train_bogey/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/entities/gmod_train_bogey/init.lua b/lua/entities/gmod_train_bogey/init.lua index 37ce450..eb09bef 100644 --- a/lua/entities/gmod_train_bogey/init.lua +++ b/lua/entities/gmod_train_bogey/init.lua @@ -403,6 +403,9 @@ function ENT:CheckContact(pos,dir,id,cpos) end end)]] end + if (traceEnt.CoupledWith == nil) then + self.Connectors[id] = nil + end end return false elseif traceEnt:GetClass() == "player" and self.Voltage > 40 then From ff80af115add8b2b1dea2bd50689fa864dd441c1 Mon Sep 17 00:00:00 2001 From: Anton Shukin Date: Sun, 11 Feb 2024 20:30:15 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/entities/gmod_train_bogey/init.lua | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lua/entities/gmod_train_bogey/init.lua b/lua/entities/gmod_train_bogey/init.lua index eb09bef..ac6ab1a 100644 --- a/lua/entities/gmod_train_bogey/init.lua +++ b/lua/entities/gmod_train_bogey/init.lua @@ -395,19 +395,14 @@ function ENT:CheckContact(pos,dir,id,cpos) sound.Play("udochka_connect.wav",traceEnt:GetPos()) self.Connectors[id] = traceEnt DropEntityIfHeld(traceEnt) - --[[timer.Simple(0,function() - if not IsValid(traceEnt) or not traceEnt:IsPlayerHolding() then return end - traceEnt:ForcePlayerDrop() - if traceEnt.LastPickup and traceEnt.LastPickup:IsPlayer() then - traceEnt.LastPickup:DropObject() - end - end)]] - end - if (traceEnt.CoupledWith == nil) then - self.Connectors[id] = nil end end return false + elseif self.Connectors[id] == traceEnt then + if traceEnt.Coupled == nil then + self.Connectors[id] = nil + end + return false elseif traceEnt:GetClass() == "player" and self.Voltage > 40 then local pPos = traceEnt:GetPos() self.VoltageDropByTouch = (self.VoltageDropByTouch or 0) + 1 From a7976c9fc9ee2aad86ffa75b5192b84870e8201b Mon Sep 17 00:00:00 2001 From: kosmik641 Date: Fri, 15 Nov 2024 17:00:20 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=83=D0=B4=D0=BE=D1=87=D0=BA=D0=B8=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D0=B5=D0=B6=D0=BA=D0=B8=20=D1=81=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D1=83=20=D0=BF=D0=BE=20=D0=B5=D1=91=20=D0=BE=D1=82=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/entities/gmod_track_udochka/init.lua | 4 +++- lua/entities/gmod_train_bogey/init.lua | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/entities/gmod_track_udochka/init.lua b/lua/entities/gmod_track_udochka/init.lua index 3186b87..c6f9e1c 100644 --- a/lua/entities/gmod_track_udochka/init.lua +++ b/lua/entities/gmod_track_udochka/init.lua @@ -22,13 +22,15 @@ local function removeWeldBetweenEnts(ent1,ent2) end end function ENT:Use(ply) - if self.Coupled then + if IsValid(self.Coupled) then sound.Play("buttons/lever8.wav",self:GetPos()) removeWeldBetweenEnts(self,self.Coupled) removeWeldBetweenEnts(self.Coupled,self) + self.Coupled.Connectors[self.ConnectorID] = nil self.Timer = CurTime()+2 end + self.ConnectorID = nil self.Coupled = nil if ( self:IsPlayerHolding() ) then return end if ply.PickupObject then ply:PickupObject( self ) end diff --git a/lua/entities/gmod_train_bogey/init.lua b/lua/entities/gmod_train_bogey/init.lua index ac6ab1a..de2cc44 100644 --- a/lua/entities/gmod_train_bogey/init.lua +++ b/lua/entities/gmod_train_bogey/init.lua @@ -392,17 +392,13 @@ function ENT:CheckContact(pos,dir,id,cpos) traceEnt:SetPos(self:LocalToWorld(cpos)) traceEnt:SetAngles(self:GetAngles()) traceEnt.Coupled = self + traceEnt.ConnectorID = id sound.Play("udochka_connect.wav",traceEnt:GetPos()) self.Connectors[id] = traceEnt DropEntityIfHeld(traceEnt) end end return false - elseif self.Connectors[id] == traceEnt then - if traceEnt.Coupled == nil then - self.Connectors[id] = nil - end - return false elseif traceEnt:GetClass() == "player" and self.Voltage > 40 then local pPos = traceEnt:GetPos() self.VoltageDropByTouch = (self.VoltageDropByTouch or 0) + 1