Merge pull request #468 from metrostroi-repo/Fixes-to-#461-#449

lua/entities/gmod_subway_em509/init.lua

@@ -8,11 +8,11 @@ ENT.BogeyDistance = 650 -- Needed for gm trainspawner
 ENT.SyncTable = {
     "VB","AV","VU","VU1","VU2","VU3","RST", "50V", "KU8","KU10","KU10R","KU9","KU2","KU1","KU1","KU11","KU13","KU3","KU4","KU5","UV1","KU6","KU7","KU6K","KU7K","KU14","KU15","UV1","KU16",
     "PanelLamp","OtklAVU","KRR","HPass",
-    "R_ASNPMenu","R_ASNPUp","R_ASNPDown","R_ASNPOn",
     "RRIEnable","RRIAmplifier",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","EmergencyBrakeValve", "UKSDisconnect",
     "GV",
     "R_Program1","R_Program1H","R_Program2H","UAVA","UAVAC",
+    "R_ASNPOn","R_ASNPDown","R_ASNPUp","R_ASNPPath","R_ASNPMenu","IGLA1","IGLA2",
 }
 ENT.SyncFunctions = {
     ""

lua/entities/gmod_subway_ezh/init.lua

@@ -6,11 +6,12 @@ ENT.BogeyDistance = 650 -- Needed for gm trainspawner
 
 --"DURASelectMain","DURASelectAlternate","DURAToggleChannel","DURAPowerToggle",
 ENT.SyncTable = {
-    "VB","AV","VU","VU1","VU2","VU3","DoorSelect","KU4","KU5","KU9","KU15","KU14","KU1","VAH","VAD","KU16","KU2","KU3","KU3L","KU13","KU6","KU7","KU10","KU8","KU11","KRR","OtklAVU","ARS","ALS","KVT","KB","KAH","R_UNch","R_ZS","R_G","R_Radio","R_ASNPOn","R_Program1","R_Program2","R_Program1H","R_Program2H","RC1","ALSFreq","PB","KU6K","RST","UOS",
+    "VB","AV","VU","VU1","VU2","VU3","DoorSelect","KU4","KU5","KU9","KU15","KU14","KU1","VAH","VAD","KU16","KU2","KU3","KU3L","KU13","KU6","KU7","KU10","KU8","KU11","KRR","OtklAVU","ARS","ALS","KVT","KB","KAH","R_UNch","R_ZS","R_G","R_Radio","R_Program1","R_Program2","R_Program1H","R_Program2H","RC1","ALSFreq","PB","KU6K","RST","UOS",
     "AB1","AB2",
     "RRIEnable","RRIAmplifier",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","EPK","EmergencyBrakeValve","UAVA","UAVAC",
-    "GV"
+    "GV",
+    "R_ASNPOn","R_ASNPDown","R_ASNPUp","R_ASNPPath","R_ASNPMenu","IGLA1","IGLA2",
 }
 ENT.SyncFunctions = {
     ""

lua/entities/gmod_subway_ezh3/init.lua

@@ -6,12 +6,13 @@ ENT.BogeyDistance = 650 -- Needed for gm trainspawner
 
 --"DURASelectMain","DURASelectAlternate","DURAToggleChannel","DURAPowerToggle",
 ENT.SyncTable = {
-    "VB","DoorSelect","V4","V5","KU9","KU15","V1","VU14","V2","V3","V6","KU12","KU7","V10","KU8","OtklAVU","KU10","KU11","KRR","R_UNch","R_ZS","R_G","R_Radio","R_Program1","R_Program2","Ring","PB","RC1","VAH","VAD","ARS","ALS","KVT","KB","KAH","VU1","VU2","VU3","AV","VU","PLights","GLights","RST","RUM","KRR","R_ASNPOn",
+    "VB","DoorSelect","V4","V5","KU9","KU15","V1","VU14","V2","V3","V6","KU12","KU7","V10","KU8","OtklAVU","KU10","KU11","KRR","R_UNch","R_ZS","R_G","R_Radio","R_Program1","R_Program2","Ring","PB","RC1","VAH","VAD","ARS","ALS","KVT","KB","KAH","VU1","VU2","VU3","AV","VU","PLights","GLights","RST","RUM","KRR",
     "R_Program1H","R_Program2H",
     "SAMMSchemeOff","SAMMStart","SAMMReset","SAMMOn","SAMMBlok","SAMMX2","SAMMAhead","SAMMAccept","SAMMUnit",
     "RRIEnable","RRIAmplifier",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","EPK","EmergencyBrakeValve","UAVA","UAVAC",
-    "GV"
+    "GV",
+    "R_ASNPOn","R_ASNPDown","R_ASNPUp","R_ASNPPath","R_ASNPMenu","IGLA1","IGLA2",
 }
 
 function ENT:Initialize()

lua/metrostroi/systems/sys_81_71_asnp.lua

@@ -245,6 +245,12 @@ if CLIENT then
             self:PrintText(0,1,Arrived and "Отпр." or "Приб.")
         end
         if State == 7 then
+            if Train:GetNW2Bool("ASNP:StopMessage",false) then
+                self:PrintText(3,0,"ПЕРЕД ОТПРАВЛЕНИЕМ")                
+                self:PrintText(0,1,"НАЖМИ КНОПКУ   ОБЪЯВИТЬ")
+                return
+            end
+
             local Line = Train:GetNW2Int("ASNP:Line",1)
             local ltbl = stbl[Line]
 
@@ -692,6 +698,7 @@ function TRAIN_SYSTEM:Trigger(name,value)
                 self:Zero()
             end
             self:Play(self.Arrived)
+            self.StopMessage = false
             self.PlayNextArmed = true
         end
     end
@@ -767,6 +774,17 @@ function TRAIN_SYSTEM:Think()
     Train:SetNW2Int("ASNP:FirstStation",self.FirstStation)
     Train:SetNW2Int("ASNP:LastStation",self.LastStation)
     Train:SetNW2Bool("ASNP:Path",self.Path)
+    Train:SetNW2Bool("ASNP:StopMessage",self.StopMessage)
+    
+    if self.State>1 and self.State~=7 then
+        self.StateTime = self.StateTime or CurTime()+10
+        if self.StateTime and CurTime()>self.StateTime then
+            for i=self.State,6 do
+                self:Trigger("R_ASNPMenu",true)
+            end
+            self.StateTime = false
+        end
+    end
 
     Train:SetNW2Bool("ASNP:Station",self.Station)
     Train:SetNW2Bool("ASNP:Arrived",self.Arrived)

lua/metrostroi/systems/sys_igla_cbki1.lua

@@ -420,7 +420,7 @@ else
             self.Error = CurTime()%0.5 > 0.25
         elseif self.State == 2 then
             if #self.Log > 100 then table.remove(self.Log,1) end
-            local Standby = CurTime()-self.StandbyTimer > 60
+            local Standby = CurTime()-self.StandbyTimer > (self.State2==3 and 60 or 10)
             if self.State2 > 0 and Standby then self.State2 = 0 end
             if self.ShowTimeTimer and self.ShowTimeTimer ~= true and CurTime()-self.ShowTimeTimer > 1.5 then
                 self.ShowTime = not self.ShowTime

lua/weapons/gmod_tool/stools/train_spawner.lua

@@ -504,6 +504,7 @@ function TOOL:RightClick(trace)
                     for k,v in pairs(ent.CustomSpawnerUpdates) do if k ~= "BaseClass" then v(ent) end end
                     hook.Run("MetrostroiSpawnerUpdate",ent,self.Settings)
                     ent:UpdateTextures()
+                    ent._Settings = self.Settings
                     table.insert(trains,ent)
                     if self.Train.Spawner.postfunc then self.Train.Spawner.postfunc(trains,self.Settings.WagNum) end
                 end