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") 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 37ce450..de2cc44 100644 --- a/lua/entities/gmod_train_bogey/init.lua +++ b/lua/entities/gmod_train_bogey/init.lua @@ -392,16 +392,10 @@ 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) - --[[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 end return false 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 +} 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..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:15805b5d08bc68541b59cc76a44b76e84a5577274994f81c21e36cc917be6dbf -size 842372 +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 988c8ee..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:fbc5e62e7b23fe90157654db33cfbf56148551150048dff4a7cbbe3ead2638eb -size 842372 +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 d5c70d5..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:48fc08a3cd5df1f3f74bb0bea66dace3a2aa60bebb2c6f44b4c9db359120b6cd -size 2152 +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 10f35b3..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:4511de83ded7614d37c17eec2c9eb17b155df8d7fc67248a385d39163914bfea -size 842348 +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 2a12b46..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:d130ab3039177df74a992550896b621a0ba52b7024de2b6ad490103840da8836 -size 3351408 +oid sha256:af064b35e1a6ee2f1355a8aa7cea64ec4fc5d4038b5a36d83ae16bdd3e5caf9f +size 3349808