Skip to content

#555 Bort number models #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

#555 Bort number models #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b18381
#523
SmileDoge Jul 21, 2022
cfb6bcd
Merge branch 'dev' of https://github.com/SmileDoge/MetrostroiAddon in…
SmileDoge Jul 21, 2022
c373bc7
бортномера для всех вагонов
SmileDoge Sep 4, 2022
ea814df
Merge branch 'BortNumberModels' of https://github.com/SmileDoge/Metro…
SmileDoge Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-501/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -986,18 +984,19 @@ 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
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-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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-502/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -2048,18 +2046,19 @@ 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
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-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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-702/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-702_int/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-703/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-703_int/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-714_lvz/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
15 changes: 7 additions & 8 deletions lua/entities/gmod_subway_81-714_mvm/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading