metrostroi-repo/MetrostroiAddon
1
0
Fork 0
mirror of https://github.com/metrostroi-repo/MetrostroiAddon.git synced 2026-05-04 00:52:33 +00:00
Code Activity

Fixed hook to work in ARSonly signal

Browse Source
This commit is contained in:
alexandr_sizov
2022-02-04 16:09:28 +03:00
parent f569694527
commit 5575d57ff5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lua/entities/gmod_track_signal/init.lua
View File

@@ -598,6 +598,11 @@ function ENT:Think()
if self.KGU then number = number.."K" end if self.KGU then number = number.."K" end
if number then self:SetNW2String("Number",number) end if number then self:SetNW2String("Number",number) end
if self.Occupied ~= self.OccupiedOld then
hook.Run("Metrostroi.Signaling.ChangeRCState", self.Name, self.Occupied, self)
self.OccupiedOld = self.Occupied
end
if self.ARSOnly then if self.ARSOnly then
if self.Sprites then if self.Sprites then
for k,v in pairs(self.Sprites) do for k,v in pairs(self.Sprites) do
@@ -651,12 +656,17 @@ function ENT:Think()
local number = self.RouteNumberReplace or "" local number = self.RouteNumberReplace or ""
if self.ControllerLogicCheckOccupied then if self.ControllerLogicCheckOccupied then
self.PrevTime = self.PrevTime or 0 self.PrevTime = self.PrevTime or 0
if (CurTime() - self.PrevTime) > 1.0 then if (CurTime() - self.PrevTime) > 0.5 then
self.PrevTime = CurTime() + math.random(0.5,1.5) self.PrevTime = CurTime() + math.random(0.5,1.5)
if self.Node and self.TrackPosition then if self.Node and self.TrackPosition then
self.Occupied,self.OccupiedBy,self.OccupiedByNow = Metrostroi.IsTrackOccupied(self.Node, self.TrackPosition.x,self.TrackPosition.forward,self.ARSOnly and "ars" or "light", self) self.Occupied,self.OccupiedBy,self.OccupiedByNow = Metrostroi.IsTrackOccupied(self.Node, self.TrackPosition.x,self.TrackPosition.forward,self.ARSOnly and "ars" or "light", self)
end end
end end
if self.Occupied ~= self.OccupiedOld then
hook.Run("Metrostroi.Signaling.ChangeRCState", self.Name, self.Occupied, self)
self.OccupiedOld = self.Occupied
end
end end
--[[ --[[
if self.MU or self.ARSOnly or self.RouteNumberSetup and self.RouteNumberSetup ~= "" or self.RouteNumber and self.RouteNumber ~= "" then if self.MU or self.ARSOnly or self.RouteNumberSetup and self.RouteNumberSetup ~= "" or self.RouteNumber and self.RouteNumber ~= "" then
@@ -697,10 +707,7 @@ function ENT:Think()
end end
end end
end end
if self.Occupied ~= self.OccupiedOld then
hook.Run("Metrostroi.Signaling.ChangeRCState", self.Name, self.Occupied, self)
self.OccupiedOld = self.Occupied
end
if self.Controllers then if self.Controllers then
for k,v in pairs(self.Controllers) do for k,v in pairs(self.Controllers) do
if self.Sig ~= v.Sig then if self.Sig ~= v.Sig then