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

УПО.

Browse Source 
Перенос Announcer Reset после проверки из функции OnUPOArrived
This commit is contained in:
kosmik641
2022-08-16 12:44:25 +03:00
parent d4530591e7
commit a7170bb820
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lua/metrostroi/systems/sys_81_71_upo.lua
View File

@@ -44,11 +44,11 @@ end
function TRAIN_SYSTEM:Play(dep) function TRAIN_SYSTEM:Play(dep)
local tbl = Metrostroi.UPOSetup local tbl = Metrostroi.UPOSetup
if not tbl then return end if not tbl then return end
self.Train.Announcer:TriggerInput("Reset","AnnouncementsUPO")
local stbl = tbl[self.Station] local stbl = tbl[self.Station]
local path = self.Path and 2 or 1
if not stbl or dep and not stbl.dep or not dep and not stbl.arr and not stbl.arrlast then return end if not stbl or dep and not stbl.dep or not dep and not stbl.arr and not stbl.arrlast then return end
local path = self.Path and 2 or 1
if dep and stbl.dep and stbl.dep[path] and (not self.Train.OnUPOArrived or self.Train:OnUPOArrived()) then if dep and stbl.dep and stbl.dep[path] and (not self.Train.OnUPOArrived or self.Train:OnUPOArrived()) then
self.Train.Announcer:TriggerInput("Reset","AnnouncementsUPO")
self:AnnQueue(-2) self:AnnQueue(-2)
self:AnnQueue{"noise_end","buzz_end_upo"} self:AnnQueue{"noise_end","buzz_end_upo"}
if self.Buzz then self:AnnQueue{"buzz_start_upo",self.Buzz} else self:AnnQueue("buzz_end_upo") end if self.Buzz then self:AnnQueue{"buzz_start_upo",self.Buzz} else self:AnnQueue("buzz_end_upo") end
@@ -68,6 +68,7 @@ function TRAIN_SYSTEM:Play(dep)
lastst = true lastst = true
end end
if msg and (not self.Train.OnUPOArrived or self.Train:OnUPOArrived()) then if msg and (not self.Train.OnUPOArrived or self.Train:OnUPOArrived()) then
self.Train.Announcer:TriggerInput("Reset","AnnouncementsUPO")
self:AnnQueue(-2) self:AnnQueue(-2)
self:AnnQueue{"noise_end","buzz_end_upo"} self:AnnQueue{"noise_end","buzz_end_upo"}
if self.Buzz then self:AnnQueue{"buzz_start_upo",self.Buzz} else self:AnnQueue("buzz_end_upo") end if self.Buzz then self:AnnQueue{"buzz_start_upo",self.Buzz} else self:AnnQueue("buzz_end_upo") end