diff --git a/lua/entities/gmod_subway_81-501/cl_init.lua b/lua/entities/gmod_subway_81-501/cl_init.lua index d3ac393b..cf216d98 100644 --- a/lua/entities/gmod_subway_81-501/cl_init.lua +++ b/lua/entities/gmod_subway_81-501/cl_init.lua @@ -467,10 +467,9 @@ ENT.ButtonMap["AirDistributor"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,69,-26), - ang = Angle(180,0,180), - skin=0, + ang = Angle(180,270,180), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -479,10 +478,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,-66.4,-26), - ang = Angle(0,0,0), - skin=0, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -986,6 +984,7 @@ function ENT:Initialize() self.EmergencyBrakeValveRamp = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() for i=0,3 do @@ -993,11 +992,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(295+i*6.6-3*6.6/2,69,-26))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(-280-i*6.6-3*6.6/2,-66.6,-26))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-502/cl_init.lua b/lua/entities/gmod_subway_81-502/cl_init.lua index 98ca5bbf..455e3839 100644 --- a/lua/entities/gmod_subway_81-502/cl_init.lua +++ b/lua/entities/gmod_subway_81-502/cl_init.lua @@ -1469,10 +1469,9 @@ ENT.ButtonMap["UAVAPanel"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,69,-26), - ang = Angle(180,0,180), - skin=0, + ang = Angle(180,270,180), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -1481,10 +1480,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,-66.4,-26), - ang = Angle(0,0,0), - skin=0, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -2048,6 +2046,7 @@ function ENT:Initialize() self.EmergencyValveRamp = 0 self.EmergencyBrakeValveRamp = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() for i=0,3 do @@ -2055,11 +2054,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(295+i*6.6-3*6.6/2,69,-26))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(-280-i*6.6-3*6.6/2,-66.6,-26))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-702/cl_init.lua b/lua/entities/gmod_subway_81-702/cl_init.lua index 3cfbe14d..865789a5 100644 --- a/lua/entities/gmod_subway_81-702/cl_init.lua +++ b/lua/entities/gmod_subway_81-702/cl_init.lua @@ -604,10 +604,9 @@ ENT.ButtonMap["UAVAPanel"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(400+i*6.6-4*6.6/2,67.5,-26), - ang = Angle(180,0,180), - skin=0, + ang = Angle(180,270,180), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -616,10 +615,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(-405-i*6.6-4*6.6/2,-67.4,-26), - ang = Angle(0,0,0), - skin=0, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -1194,6 +1192,7 @@ function ENT:Initialize() self.EmergencyValveEPKRamp = 0 self.EmergencyBrakeValveRamp = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() local count = math.max(3,math.ceil(math.log10(self.WagonNumber+1))) for i=0,3 do @@ -1204,11 +1203,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(400+i*6.6-4*6.6/2,67.5,-26))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(-405-i*6.6-4*6.6/2,-67.4,-26))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-702_int/cl_init.lua b/lua/entities/gmod_subway_81-702_int/cl_init.lua index 729d3396..37192c32 100644 --- a/lua/entities/gmod_subway_81-702_int/cl_init.lua +++ b/lua/entities/gmod_subway_81-702_int/cl_init.lua @@ -568,10 +568,9 @@ ENT.ButtonMap["UAVAPanel"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(400+i*6.6-4*6.6/2,67.5,-26), - ang = Angle(180,0,180), - skin=0, + ang = Angle(180,270,180), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -580,10 +579,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(-405-i*6.6-4*6.6/2,-67.4,-26), - ang = Angle(0,0,0), - skin=0, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -995,6 +993,7 @@ function ENT:Initialize() self.EmergencyValveEPKRamp = 0 self.EmergencyBrakeValveRamp = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() local count = math.max(3,math.ceil(math.log10(self.WagonNumber+1))) for i=0,3 do @@ -1005,11 +1004,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(400+i*6.6-4*6.6/2,67.5,-26))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(-405-i*6.6-4*6.6/2,-67.4,-26))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-703/cl_init.lua b/lua/entities/gmod_subway_81-703/cl_init.lua index 8054b17f..6115de88 100644 --- a/lua/entities/gmod_subway_81-703/cl_init.lua +++ b/lua/entities/gmod_subway_81-703/cl_init.lua @@ -615,10 +615,9 @@ ENT.ButtonMap["UAVAPanel"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,69,-26), - ang = Angle(180,0,180), - skin=0, + ang = Angle(180,270,180), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -627,10 +626,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,-66.4,-26), - ang = Angle(0,0,0), - skin=0, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -1188,17 +1186,18 @@ function ENT:Initialize() self.OldSpeedoDelta = 0 self.SpeedoDelta = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() for i=0,3 do 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(410-15+i*6.6-3*6.6/2,69,-26))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(-392-15-i*6.6-3*6.6/2,-66.6,-26))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-703_int/cl_init.lua b/lua/entities/gmod_subway_81-703_int/cl_init.lua index 671d869b..f963a69f 100644 --- a/lua/entities/gmod_subway_81-703_int/cl_init.lua +++ b/lua/entities/gmod_subway_81-703_int/cl_init.lua @@ -568,10 +568,9 @@ ENT.ButtonMap["UAVAPanel"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,69,-26), - ang = Angle(180,0,180), - skin=0, + ang = Angle(180,270,180), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -580,10 +579,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(295+i*6.6-4*6.6/2,-66.4,-26), - ang = Angle(0,0,0), - skin=0, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -1049,17 +1047,18 @@ function ENT:Initialize() self.OldSpeedoDelta = 0 self.SpeedoDelta = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() for i=0,3 do 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(410-15+i*6.6-3*6.6/2,69,-26))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(-392-15-i*6.6-3*6.6/2,-66.6,-26))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-714_lvz/cl_init.lua b/lua/entities/gmod_subway_81-714_lvz/cl_init.lua index 81e3445d..1fa6d621 100644 --- a/lua/entities/gmod_subway_81-714_lvz/cl_init.lua +++ b/lua/entities/gmod_subway_81-714_lvz/cl_init.lua @@ -798,20 +798,18 @@ for i = 0,12 do end for i=0,4 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(41+16+i*6.6-5*6.6/2,67.4,-17.8), - ang = Angle(0,180,0), - skin=i, + ang = Angle(0,90,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false end, } ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(64+16-i*6.6-5*6.6/2,-67.4,-17.8), - ang = Angle(0,0,0), - skin=i, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -842,6 +840,7 @@ ENT.Lights = { [26] = { "light",Vector(-6.5,-67,51.2)+Vector(-3.28,-0.9,-0.02), Angle(0,0,0), Color(254,210,18), brightness = 0.1, scale = 0.2, texture = "sprites/light_glow02", size = 1.5 }, } -------------------------------------------------------------------------------- +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() local count = math.max(4,math.ceil(math.log10(self.WagonNumber+1))) for i=0,4 do @@ -852,11 +851,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(41+16+i*6.6-count*6.6/2,67.4,-17.8))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(64+16-i*6.6-count*6.6/2,-67.4,-17.8))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-714_mvm/cl_init.lua b/lua/entities/gmod_subway_81-714_mvm/cl_init.lua index 974d47cb..7066ede2 100644 --- a/lua/entities/gmod_subway_81-714_mvm/cl_init.lua +++ b/lua/entities/gmod_subway_81-714_mvm/cl_init.lua @@ -826,20 +826,18 @@ for i = 0,26 do end for i=0,4 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(41+16+i*6.6-5*6.6/2,67.4,-17.8), - ang = Angle(0,180,0), - skin=i, + ang = Angle(0,90,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false end, } ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(64+16-i*6.6-5*6.6/2,-67.4,-17.8), - ang = Angle(0,0,0), - skin=i, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -868,6 +866,7 @@ ENT.Lights = { [26] = { "light",Vector(-6.5,-67,51.2)+Vector(-3.28,-0.9,-0.02), Angle(0,0,0), Color(254,210,18), brightness = 0.1, scale = 0.2, texture = "sprites/light_glow02", size = 1.5 }, } -------------------------------------------------------------------------------- +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() local count = math.max(4,math.ceil(math.log10(self.WagonNumber+1))) for i=0,4 do @@ -878,11 +877,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(41+16+i*6.6-count*6.6/2,67.4,-17.8))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(64+16-i*6.6-count*6.6/2,-67.4,-17.8))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua index f49cdcb3..2237bdfd 100644 --- a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua +++ b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua @@ -2419,9 +2419,9 @@ ENT.ButtonMap["AirDistributor"] = { for i=0,4 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(43+i*6.4,67.2,-12), - ang = Angle(0,180,0), + ang = Angle(0,90,0), skin=i, hide = 1.5, callback = function(ent) @@ -2429,10 +2429,9 @@ for i=0,4 do end, } ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(64-i*6.4,-67.2,-12), - ang = Angle(0,0,0), - skin=i, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -2951,6 +2950,8 @@ function ENT:Initialize() self.BPSNBuzzVolume = 0 end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" + function ENT:UpdateWagonNumber() local count = math.max(4,math.ceil(math.log10(self.WagonNumber+1))) for i=0,4 do @@ -2961,11 +2962,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(41+16+i*6.6-count*6.6/2,67.4,-17.8))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(64+16-i*6.6-count*6.6/2,-67.4,-17.8))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua index afe5a49b..a33bcebd 100644 --- a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua +++ b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua @@ -2054,20 +2054,18 @@ ENT.ButtonMap["AutostopValve"] = { for i=0,4 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(41+16+i*6.6-5*6.6/2,67.4,-17.8), - ang = Angle(0,180,0), - skin=i, + ang = Angle(0,90,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false end, } ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(64+16-i*6.6-5*6.6/2,-67.4,-17.8), - ang = Angle(0,0,0), - skin=i, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -2666,6 +2664,8 @@ function ENT:Initialize() end end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" + function ENT:UpdateWagonNumber() local count = math.max(4,math.ceil(math.log10(self.WagonNumber+1))) for i=0,4 do @@ -2676,11 +2676,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(41+16+i*6.6-count*6.6/2,67.4,-17.8))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(64+16-i*6.6-count*6.6/2,-67.4,-17.8))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-718/cl_init.lua b/lua/entities/gmod_subway_81-718/cl_init.lua index 73cdc684..a87192dc 100644 --- a/lua/entities/gmod_subway_81-718/cl_init.lua +++ b/lua/entities/gmod_subway_81-718/cl_init.lua @@ -2047,26 +2047,25 @@ function ENT:Initialize() end for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(41+16+i*6.6-5*6.6/2,67.4,-17.8), - ang = Angle(0,180,0), - skin=i, + ang = Angle(0,90,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false end, } ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(64+16-i*6.6-5*6.6/2,-67.4,-17.8), - ang = Angle(0,0,0), - skin=i, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false end, } end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() local count = self.WagonNumber < 250 and 3 or 4 for i=0,3 do @@ -2077,11 +2076,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(41+16+i*6.6-count*6.6/2,67.4,-17.8))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(64+16-i*6.6-count*6.6/2,-67.4,-17.8))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-719/cl_init.lua b/lua/entities/gmod_subway_81-719/cl_init.lua index bbfa156d..7202f9b0 100644 --- a/lua/entities/gmod_subway_81-719/cl_init.lua +++ b/lua/entities/gmod_subway_81-719/cl_init.lua @@ -818,20 +818,18 @@ for i=1,8 do end for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(41+16+i*6.6-5*6.6/2,67.4,-17.8), - ang = Angle(0,180,0), - skin=i, + ang = Angle(0,90,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false end, } ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(64+16-i*6.6-5*6.6/2,-67.4,-17.8), - ang = Angle(0,0,0), - skin=i, + ang = Angle(0,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -880,6 +878,7 @@ function ENT:Initialize() self.VentVol[i] = 0 end end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() for i=0,3 do local count = self.WagonNumber < 250 and 3 or 4 @@ -890,11 +889,11 @@ function ENT:UpdateWagonNumber() local num = math.floor(self.WagonNumber%(10^(i+1))/10^i) if IsValid(leftNum) then leftNum:SetPos(self:LocalToWorld(Vector(41+16+i*6.6-count*6.6/2,67.4,-17.8))) - leftNum:SetSkin(num) + leftNum:SetModel(Format(bortnumber_format, num)) end if IsValid(rightNum) then rightNum:SetPos(self:LocalToWorld(Vector(64+16-i*6.6-count*6.6/2,-67.4,-17.8))) - rightNum:SetSkin(num) + rightNum:SetModel(Format(bortnumber_format, num)) end end end diff --git a/lua/entities/gmod_subway_81-720/cl_init.lua b/lua/entities/gmod_subway_81-720/cl_init.lua index ee1dcf59..0796677c 100644 --- a/lua/entities/gmod_subway_81-720/cl_init.lua +++ b/lua/entities/gmod_subway_81-720/cl_init.lua @@ -1040,10 +1040,9 @@ ENT.ButtonMap["RearDoor1"] = { for i=0,3 do ENT.ClientProps["TrainNumberL"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(57+i*6.6-4*6.6/2,66.3,18), - ang = Angle(0,180,-5), - skin=0, + ang = Angle(-5,90,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -1052,10 +1051,9 @@ for i=0,3 do end for i=0,3 do ENT.ClientProps["TrainNumberR"..i] = { - model = "models/metrostroi_train/common/bort_numbers.mdl", + model = "models/metrostroi_train/81-714_mmz/bortnumber_" .. i .. ".mdl", pos = Vector(61+i*6.6-4*6.6/2,-66.3,18), - ang = Angle(0,0,-5), - skin=0, + ang = Angle(-5,270,0), hide = 1.5, callback = function(ent) ent.WagonNumber = false @@ -1647,6 +1645,7 @@ function ENT:Initialize() self.VentVol[i] = 0 end end +local bortnumber_format = "models/metrostroi_train/81-714_mmz/bortnumber_%d.mdl" function ENT:UpdateWagonNumber() for i=0,3 do --self:ShowHide("TrainNumberL"..i,i