metrostroi-repo/MetrostroiAddon
1
0
Fork 0
mirror of https://github.com/metrostroi-repo/MetrostroiAddon.git synced 2026-05-02 00:42:29 +00:00
Code Activity

Merge pull request #623 from metrostroi-repo/#12-fix

Browse Source 
Фикс БМЦИК 81-722
This commit is contained in:
Sherbanov Kosmik
2025-11-12 16:35:44 +03:00
committed by GitHub
parent 15e70e0cf6 8d071afcf6
commit 7c85e685d9
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/entities/gmod_subway_81-722/shared.lua
View File

@@ -252,7 +252,7 @@ function ENT:InitializeSounds()
self.SoundPositions["announcer_noise3_"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1} self.SoundPositions["announcer_noise3_"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1}
self.SoundNames["announcer_noiseW"..k] = {loop=true,"subway_announcers/upo/noiseW.wav"} self.SoundNames["announcer_noiseW"..k] = {loop=true,"subway_announcers/upo/noiseW.wav"}
self.SoundPositions["announcer_noiseW"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1} self.SoundPositions["announcer_noiseW"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1}
self.SoundNames["announcer_sarmat_start"..k] = {"subway_announcers/sarmat_upo/sarmat_start.mp3"} self.SoundNames["announcer_sarmat_start"..k] = {"subway_trains/722/sarmat_start.mp3"}
self.SoundPositions["announcer_sarmat_start"..k] = {v[2] or 300,1e9,v[1],v[3]} self.SoundPositions["announcer_sarmat_start"..k] = {v[2] or 300,1e9,v[1],v[3]}
end end
end end

3
lua/entities/gmod_subway_81-723/cl_init.lua
View File

@@ -744,7 +744,6 @@ function ENT:Think()
local UPO = work and self.Announcer.AnnTable == "AnnouncementsUPO" local UPO = work and self.Announcer.AnnTable == "AnnouncementsUPO"
local noise = self:GetNW2Int("AnnouncerNoise") local noise = self:GetNW2Int("AnnouncerNoise")
local volBMCIK = self:GetNW2Int("BMCIK:VolCab",0)/10
local volBNT = self:GetNW2Int("BNT:Volumes",0) local volBNT = self:GetNW2Int("BNT:Volumes",0)
local volSalon = 0 local volSalon = 0
@@ -763,8 +762,6 @@ function ENT:Think()
targetVol = v[3]*volSalon*bntPowerL targetVol = v[3]*volSalon*bntPowerL
elseif v[4] == 0x52 then -- [R]ight side elseif v[4] == 0x52 then -- [R]ight side
targetVol = v[3]*volSalon*bntPowerR targetVol = v[3]*volSalon*bntPowerR
elseif v[4] == 0x43 then -- [C]abin
targetVol = v[3]*volBMCIK
end end
end end

2
lua/entities/gmod_subway_81-723/shared.lua
View File

@@ -144,7 +144,7 @@ function ENT:InitializeSounds()
self.SoundPositions["announcer_noise3_"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1} self.SoundPositions["announcer_noise3_"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1}
self.SoundNames["announcer_noiseW"..k] = {loop=true,"subway_announcers/upo/noiseW.wav"} self.SoundNames["announcer_noiseW"..k] = {loop=true,"subway_announcers/upo/noiseW.wav"}
self.SoundPositions["announcer_noiseW"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1} self.SoundPositions["announcer_noiseW"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1}
self.SoundNames["announcer_sarmat_start"..k] = {"subway_announcers/sarmat_upo/sarmat_start.mp3"} self.SoundNames["announcer_sarmat_start"..k] = {"subway_trains/722/sarmat_start.mp3"}
self.SoundPositions["announcer_sarmat_start"..k] = {v[2] or 300,1e9,v[1],v[3]} self.SoundPositions["announcer_sarmat_start"..k] = {v[2] or 300,1e9,v[1],v[3]}
end end
end end

3
lua/entities/gmod_subway_81-724/cl_init.lua
View File

@@ -707,7 +707,6 @@ function ENT:Think()
local UPO = work and self.Announcer.AnnTable == "AnnouncementsUPO" local UPO = work and self.Announcer.AnnTable == "AnnouncementsUPO"
local noise = self:GetNW2Int("AnnouncerNoise") local noise = self:GetNW2Int("AnnouncerNoise")
local volBMCIK = self:GetNW2Int("BMCIK:VolCab",0)/10
local volBNT = self:GetNW2Int("BNT:Volumes",0) local volBNT = self:GetNW2Int("BNT:Volumes",0)
local volSalon = 0 local volSalon = 0
@@ -726,8 +725,6 @@ function ENT:Think()
targetVol = v[3]*volSalon*bntPowerL targetVol = v[3]*volSalon*bntPowerL
elseif v[4] == 0x52 then -- [R]ight side elseif v[4] == 0x52 then -- [R]ight side
targetVol = v[3]*volSalon*bntPowerR targetVol = v[3]*volSalon*bntPowerR
elseif v[4] == 0x43 then -- [C]abin
targetVol = v[3]*volBMCIK
end end
end end

2
lua/entities/gmod_subway_81-724/shared.lua
View File

@@ -117,7 +117,7 @@ function ENT:InitializeSounds()
self.SoundPositions["announcer_noise3_"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1} self.SoundPositions["announcer_noise3_"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1}
self.SoundNames["announcer_noiseW"..k] = {loop=true,"subway_announcers/upo/noiseW.wav"} self.SoundNames["announcer_noiseW"..k] = {loop=true,"subway_announcers/upo/noiseW.wav"}
self.SoundPositions["announcer_noiseW"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1} self.SoundPositions["announcer_noiseW"..k] = {v[2] or 300,1e9,v[1],v[3]*0.1}
self.SoundNames["announcer_sarmat_start"..k] = {"subway_announcers/sarmat_upo/sarmat_start.mp3"} self.SoundNames["announcer_sarmat_start"..k] = {"subway_trains/722/sarmat_start.mp3"}
self.SoundPositions["announcer_sarmat_start"..k] = {v[2] or 300,1e9,v[1],v[3]} self.SoundPositions["announcer_sarmat_start"..k] = {v[2] or 300,1e9,v[1],v[3]}
end end
end end