From ce6695075d821994b671b6bc69ca28fdba7f5881 Mon Sep 17 00:00:00 2001 From: TheFUlDeep Date: Thu, 4 Mar 2021 16:44:21 +0300 Subject: [PATCH 1/3] resolve #105 --- lua/entities/gmod_track_signal/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/entities/gmod_track_signal/init.lua b/lua/entities/gmod_track_signal/init.lua index e58d90f..b684cbc 100644 --- a/lua/entities/gmod_track_signal/init.lua +++ b/lua/entities/gmod_track_signal/init.lua @@ -561,7 +561,7 @@ function ENT:Think() if self.NextSignalLink.RouteNumberOverrite and (not self.Red or self.InvationSignal) and self.Routes[self.Route or 1].EnRou then number = number..self.NextSignalLink.RouteNumberOverrite end - if self.NextSignalLink.RouteNumber and (self.Routes[self.Route or 1].EnRou and not self.AutoEnabled or self.InvationSignal) then + if not self.Red and self.NextSignalLink.RouteNumber and (self.Routes[self.Route or 1].EnRou and not self.AutoEnabled or self.InvationSignal) then number = number..self.NextSignalLink.RouteNumber end --print(self.Name,self.NextSignalLink.RouteNumberOverrite) From e5cb1028c2ff3160dc208682eb1130738cfcc847 Mon Sep 17 00:00:00 2001 From: TheFUlDeep Date: Fri, 5 Mar 2021 07:01:16 +0300 Subject: [PATCH 2/3] previous commit broke autostop and invation signal --- lua/entities/gmod_track_signal/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/entities/gmod_track_signal/init.lua b/lua/entities/gmod_track_signal/init.lua index b684cbc..de2d297 100644 --- a/lua/entities/gmod_track_signal/init.lua +++ b/lua/entities/gmod_track_signal/init.lua @@ -561,7 +561,7 @@ function ENT:Think() if self.NextSignalLink.RouteNumberOverrite and (not self.Red or self.InvationSignal) and self.Routes[self.Route or 1].EnRou then number = number..self.NextSignalLink.RouteNumberOverrite end - if not self.Red and self.NextSignalLink.RouteNumber and (self.Routes[self.Route or 1].EnRou and not self.AutoEnabled or self.InvationSignal) then + if self.NextSignalLink.RouteNumber and (self.Routes[self.Route or 1].EnRou and not self.AutoEnabled and not self.Red or self.InvationSignal) then number = number..self.NextSignalLink.RouteNumber end --print(self.Name,self.NextSignalLink.RouteNumberOverrite) From c703ddaca901e3108d992cd5e6cf89215de34118 Mon Sep 17 00:00:00 2001 From: TheFUlDeep Date: Mon, 15 Mar 2021 22:33:04 +0300 Subject: [PATCH 3/3] combined and moved conditions --- lua/entities/gmod_track_signal/init.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lua/entities/gmod_track_signal/init.lua b/lua/entities/gmod_track_signal/init.lua index de2d297..9372587 100644 --- a/lua/entities/gmod_track_signal/init.lua +++ b/lua/entities/gmod_track_signal/init.lua @@ -558,11 +558,13 @@ function ENT:Think() else self.RouteNumberOverrite = self.RouteNumber end - if self.NextSignalLink.RouteNumberOverrite and (not self.Red or self.InvationSignal) and self.Routes[self.Route or 1].EnRou then - number = number..self.NextSignalLink.RouteNumberOverrite - end - if self.NextSignalLink.RouteNumber and (self.Routes[self.Route or 1].EnRou and not self.AutoEnabled and not self.Red or self.InvationSignal) then - number = number..self.NextSignalLink.RouteNumber + if (not self.Red or self.InvationSignal) and self.Routes[self.Route or 1].EnRou then + if self.NextSignalLink.RouteNumberOverrite then + number = number..self.NextSignalLink.RouteNumberOverrite + end + if self.NextSignalLink.RouteNumber and not self.AutoEnabled then + number = number..self.NextSignalLink.RouteNumber + end end --print(self.Name,self.NextSignalLink.RouteNumberOverrite) self.RouteNumberOverrite = (self.RouteNumberOverrite or "")..number