diff --git a/lua/entities/gmod_subway_81-501/shared.lua b/lua/entities/gmod_subway_81-501/shared.lua index e9d40df..908daa3 100644 --- a/lua/entities/gmod_subway_81-501/shared.lua +++ b/lua/entities/gmod_subway_81-501/shared.lua @@ -104,7 +104,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk4_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk4_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.80} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} @@ -437,7 +437,7 @@ function ENT:PostInitializeSystems() self.Electric:TriggerInput("Type",self.Electric.NVL) end -ENT.NumberRanges = {{6027,6128}} +ENT.NumberRanges = {{6027,6046},{6067,6089},{6115,6120},{6252,6337},{6633,6657},{6875,6965}} ENT.SubwayTrain = { Type = "E", diff --git a/lua/entities/gmod_subway_81-502/shared.lua b/lua/entities/gmod_subway_81-502/shared.lua index eda8d53..ed2d12b 100644 --- a/lua/entities/gmod_subway_81-502/shared.lua +++ b/lua/entities/gmod_subway_81-502/shared.lua @@ -119,7 +119,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk4_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk4_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.80} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} @@ -484,7 +484,7 @@ ENT.SubwayTrain = { EKKType = 703, NoFrontEKK=true, } -ENT.NumberRanges = {{6047,6353}} +ENT.NumberRanges = {{6047,6065},{6338,6397},{6558,6632},{6966,7201}} ---[[ ENT.Spawner = { model = { diff --git a/lua/entities/gmod_subway_81-703/shared.lua b/lua/entities/gmod_subway_81-703/shared.lua index 16be7bb..57e1007 100644 --- a/lua/entities/gmod_subway_81-703/shared.lua +++ b/lua/entities/gmod_subway_81-703/shared.lua @@ -106,7 +106,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk4_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk4_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.55} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} @@ -577,7 +577,7 @@ ENT.SubwayTrain = { }, EKKType = 703, } -ENT.NumberRanges = {{3001,3100},{3301,3400},{3501,3699},{4701,4750},{4851,4900}} +ENT.NumberRanges = {{3001,3699},{4700,4824}} ENT.Spawner = { model = { diff --git a/lua/entities/gmod_subway_81-703_int/shared.lua b/lua/entities/gmod_subway_81-703_int/shared.lua index ba7690c..60e1551 100644 --- a/lua/entities/gmod_subway_81-703_int/shared.lua +++ b/lua/entities/gmod_subway_81-703_int/shared.lua @@ -135,7 +135,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk4_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk4_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.85} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} @@ -604,4 +604,4 @@ ENT.SubwayTrain = { }, EKKType = 703, } -ENT.NumberRanges = {{3001,3100},{3301,3400},{3501,3699},{4701,4750},{4851,4900}} +ENT.NumberRanges = {{3001,3699},{4700,4824}} diff --git a/lua/entities/gmod_subway_em508t/cl_init.lua b/lua/entities/gmod_subway_em508t/cl_init.lua index 5f7822c..19147b9 100644 --- a/lua/entities/gmod_subway_em508t/cl_init.lua +++ b/lua/entities/gmod_subway_em508t/cl_init.lua @@ -925,11 +925,11 @@ function ENT:UpdateWagonNumber() local leftNum,rightNum = self.ClientEnts["TrainNumberL"..i],self.ClientEnts["TrainNumberR"..i] local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then - leftNum:SetPos(self:LocalToWorld(Vector(295+i*6.6-4*6.6/2,69,-26))) + leftNum:SetPos(self:LocalToWorld(Vector(295+i*6.6-4*6.6/2,68.8,-26))) leftNum:SetSkin(num) end if IsValid(rightNum) then - rightNum:SetPos(self:LocalToWorld(Vector(-280-i*6.6-4*6.6/2,-66.6,-26))) + rightNum:SetPos(self:LocalToWorld(Vector(-280-i*6.6-4*6.6/2,-66.1,-26))) rightNum:SetSkin(num) end end diff --git a/lua/entities/gmod_subway_em508t/shared.lua b/lua/entities/gmod_subway_em508t/shared.lua index 3a1659f..e112aca 100644 --- a/lua/entities/gmod_subway_em508t/shared.lua +++ b/lua/entities/gmod_subway_em508t/shared.lua @@ -141,7 +141,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk3_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk3_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.55} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} diff --git a/lua/entities/gmod_subway_em509/shared.lua b/lua/entities/gmod_subway_em509/shared.lua index 8afefb5..a079658 100644 --- a/lua/entities/gmod_subway_em509/shared.lua +++ b/lua/entities/gmod_subway_em509/shared.lua @@ -108,7 +108,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk3_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk3_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.55} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} diff --git a/lua/entities/gmod_subway_ezh/shared.lua b/lua/entities/gmod_subway_ezh/shared.lua index 1d2c644..54288d1 100644 --- a/lua/entities/gmod_subway_ezh/shared.lua +++ b/lua/entities/gmod_subway_ezh/shared.lua @@ -143,7 +143,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk3_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk3_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.55} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} @@ -600,7 +600,7 @@ ENT.SubwayTrain = { EKKType = 703, NoFrontEKK=false, } -ENT.NumberRanges = {{5101,5330}} +ENT.NumberRanges = {{5101,5560}} ENT.Spawner = { model = { diff --git a/lua/entities/gmod_subway_ezh1/shared.lua b/lua/entities/gmod_subway_ezh1/shared.lua index 3611981..cbad7a8 100644 --- a/lua/entities/gmod_subway_ezh1/shared.lua +++ b/lua/entities/gmod_subway_ezh1/shared.lua @@ -137,7 +137,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk3_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk3_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.55} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} @@ -586,4 +586,4 @@ ENT.SubwayTrain = { }, EKKType = 703, } -ENT.NumberRanges = {{3001,3100},{3301,3400},{3501,3699},{4701,4750},{4851,4900}} +ENT.NumberRanges = {{5101,5560}} diff --git a/lua/entities/gmod_subway_ezh3/cl_init.lua b/lua/entities/gmod_subway_ezh3/cl_init.lua index 9e2e6b4..da92a27 100644 --- a/lua/entities/gmod_subway_ezh3/cl_init.lua +++ b/lua/entities/gmod_subway_ezh3/cl_init.lua @@ -1549,7 +1549,7 @@ function ENT:UpdateWagonNumber() leftNum:SetSkin(num) end if IsValid(rightNum) then - rightNum:SetPos(self:LocalToWorld(Vector(-280-i*6.6-3*6.6/2,-66.2,-26))) + rightNum:SetPos(self:LocalToWorld(Vector(-280-i*6.6-3*6.6/2,-66.4,-26))) rightNum:SetSkin(num) end end diff --git a/lua/entities/gmod_subway_ezh3/shared.lua b/lua/entities/gmod_subway_ezh3/shared.lua index 6a9c68f..53f6533 100644 --- a/lua/entities/gmod_subway_ezh3/shared.lua +++ b/lua/entities/gmod_subway_ezh3/shared.lua @@ -145,7 +145,7 @@ function ENT:InitializeSounds() self.SoundPositions["lk3_on"] = self.SoundPositions["lk2_on"] self.SoundPositions["lk3_off"] = self.SoundPositions["lk2_off"] - self.SoundNames["compressor"] = {loop=1.79,"subway_trains/717/compressor/compressor_717_start2.wav","subway_trains/717/compressor/compressor_717_loop2.wav", "subway_trains/717/compressor/compressor_717_stop2.wav"} + self.SoundNames["compressor"] = {loop=1.79,"subway_trains/ezh/compressor/ezh_compressor_start.wav","subway_trains/ezh/compressor/ezh_compressor_loop.wav", "subway_trains/ezh/compressor/ezh_compressor_end.wav"} self.SoundPositions["compressor"] = {485,1e9,Vector(-118,-40,-66),0.55} self.SoundNames["compressor_reflection"] = {"subway_trains/common/junk/junk_background2.wav"} self.SoundPositions["compressor_reflection"] = {150,1e9,Vector(300,0,0)} diff --git a/sound/subway_trains/ezh/compressor/ezh_compressor_end.wav b/sound/subway_trains/ezh/compressor/ezh_compressor_end.wav new file mode 100644 index 0000000..4885e68 --- /dev/null +++ b/sound/subway_trains/ezh/compressor/ezh_compressor_end.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ddfed10f8d02427adf5fadc459201aecbb4aab15bc8a102d83d093e46b02e09 +size 177512 diff --git a/sound/subway_trains/ezh/compressor/ezh_compressor_loop.wav b/sound/subway_trains/ezh/compressor/ezh_compressor_loop.wav new file mode 100644 index 0000000..4804558 --- /dev/null +++ b/sound/subway_trains/ezh/compressor/ezh_compressor_loop.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ec89ece3f768c4eec925b89181e742677245e5135ef42261c2ef84011f7ab9f +size 2562152 diff --git a/sound/subway_trains/ezh/compressor/ezh_compressor_start.wav b/sound/subway_trains/ezh/compressor/ezh_compressor_start.wav new file mode 100644 index 0000000..c3d0272 --- /dev/null +++ b/sound/subway_trains/ezh/compressor/ezh_compressor_start.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da197ac73774903720f5373449feca40da31670f31c13d84b55e3e512240b9df +size 414824