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

Merge pull request #369 from metrostroi-repo/#366-#291

#366 #291
This commit is contained in:
HellReach
2021-11-06 18:13:52 +03:00
committed by GitHub
5 changed files with 30 additions and 29 deletions

View File

@@ -205,8 +205,8 @@ ENT.ClientSounds["RearBrakeLineIsolation"] = {{"RearBrake",function() return "di
ENT.ClientSounds["RearTrainLineIsolation"] = {{"RearTrain",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}} ENT.ClientSounds["RearTrainLineIsolation"] = {{"RearTrain",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}}
ENT.ButtonMap["GV"] = { ENT.ButtonMap["GV"] = {
pos = Vector(170-3-9.5,50+20,-60+2), pos = Vector(-165,-50+20-40,-60+2),
ang = Angle(0,225-15,90), ang = Angle(0,225-15-180,90),
width = 260, width = 260,
height = 260, height = 260,
scale = 0.1, scale = 0.1,
@@ -221,21 +221,21 @@ ENT.ButtonMap["GV"] = {
} }
ENT.ClientProps["gv"] = { ENT.ClientProps["gv"] = {
model = "models/metrostroi/81-717/gv.mdl", model = "models/metrostroi/81-717/gv.mdl",
pos = Vector(153.5-3-9.5,36+20,-78+2), pos = Vector(-153.5,36+20-115,-78+3),
ang = Angle(-90,90,-90), ang = Angle(-90,90-180,-90),
color = Color(150,255,255), color = Color(150,255,255),
hide = 0.5, hide = 0.5,
} }
ENT.ClientProps["gv_wrench"] = { ENT.ClientProps["gv_wrench"] = {
model = "models/metrostroi_train/reversor/reversor_classic.mdl", model = "models/metrostroi_train/reversor/reversor_classic.mdl",
pos = ENT.ClientProps["gv"].pos, pos = ENT.ClientProps["gv"].pos,
ang = Angle(-90,0,0), ang = Angle(-90,180,0),
hide = 0.5, hide = 0.5,
} }
ENT.ButtonMap["AirDistributor"] = { ENT.ButtonMap["AirDistributor"] = {
pos = Vector(-185,-68,-50), pos = Vector(185,68,-50),
ang = Angle(0,0,90), ang = Angle(0,180,90),
width = 170, width = 170,
height = 80, height = 80,
scale = 0.1, scale = 0.1,
@@ -314,8 +314,8 @@ ENT.ButtonMap["couch_cap_o"] = {
} }
} }
ENT.ButtonMap["Stopkran"] = { ENT.ButtonMap["Stopkran"] = {
pos = Vector(-397,-60,0), pos = Vector(397-13.1,60,0),
ang = Angle(0,180,70), ang = Angle(0,0,70),
width = 1000, width = 1000,
height = 600, height = 600,
scale = 0.0625, scale = 0.0625,
@@ -946,7 +946,7 @@ function ENT:Think()
self:HidePanel("couch_cap_o",not capOpened) self:HidePanel("couch_cap_o",not capOpened)
self:HidePanel("AV_S",not capOpened) self:HidePanel("AV_S",not capOpened)
self:HidePanel("AV_T",not capOpened) self:HidePanel("AV_T",not capOpened)
self:HidePanel("Stopkran",not capOpened) -- self:HidePanel("Stopkran",not capOpened)
self:ShowHide("otsek_cap_r",not capOpened) self:ShowHide("otsek_cap_r",not capOpened)
self:ShowHide("brake334",capOpened and not c013) self:ShowHide("brake334",capOpened and not c013)
self:ShowHide("brake013",capOpened and c013) self:ShowHide("brake013",capOpened and c013)

View File

@@ -8,7 +8,7 @@ ENT.SyncTable = {
"A70","A81","A80","A18", "A70","A81","A80","A18",
"VB","GV", "VB","GV",
"DriverValveBLDisconnect","DriverValveTLDisconnect","ParkingBrake", "DriverValveBLDisconnect","DriverValveTLDisconnect","ParkingBrake",
"A84","BPSNon","ConverterProtection","L_1","Start","VozvratRP" "A84","BPSNon","ConverterProtection","L_1","Start","VozvratRP","EmergencyBrakeValve"
} }
function ENT:Initialize() function ENT:Initialize()

View File

@@ -202,8 +202,8 @@ ENT.ClientSounds["RearBrakeLineIsolation"] = {{"RearBrake",function() return "di
ENT.ClientSounds["RearTrainLineIsolation"] = {{"RearTrain",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}} ENT.ClientSounds["RearTrainLineIsolation"] = {{"RearTrain",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}}
ENT.ButtonMap["GV"] = { ENT.ButtonMap["GV"] = {
pos = Vector(170-3-9.5,50+20,-60+2), pos = Vector(-165,-50+20-40,-60+2),
ang = Angle(0,225-15,90), ang = Angle(0,225-15-180,90),
width = 260, width = 260,
height = 260, height = 260,
scale = 0.1, scale = 0.1,
@@ -218,21 +218,21 @@ ENT.ButtonMap["GV"] = {
} }
ENT.ClientProps["gv"] = { ENT.ClientProps["gv"] = {
model = "models/metrostroi/81-717/gv.mdl", model = "models/metrostroi/81-717/gv.mdl",
pos = Vector(153.5-3-9.5,36+20,-78+2), pos = Vector(-153.5,36+20-115,-78+3),
ang = Angle(-90,90,-90), ang = Angle(-90,90-180,-90),
color = Color(150,255,255), color = Color(150,255,255),
hide = 0.5, hide = 0.5,
} }
ENT.ClientProps["gv_wrench"] = { ENT.ClientProps["gv_wrench"] = {
model = "models/metrostroi_train/reversor/reversor_classic.mdl", model = "models/metrostroi_train/reversor/reversor_classic.mdl",
pos = ENT.ClientProps["gv"].pos, pos = ENT.ClientProps["gv"].pos,
ang = Angle(-90,0,0), ang = Angle(-90,180,0),
hide = 0.5, hide = 0.5,
} }
ENT.ButtonMap["AirDistributor"] = { ENT.ButtonMap["AirDistributor"] = {
pos = Vector(-185,-68,-50), pos = Vector(185,68,-50),
ang = Angle(0,0,90), ang = Angle(0,180,90),
width = 170, width = 170,
height = 80, height = 80,
scale = 0.1, scale = 0.1,
@@ -311,8 +311,8 @@ ENT.ButtonMap["couch_cap_o"] = {
} }
} }
ENT.ButtonMap["Stopkran"] = { ENT.ButtonMap["Stopkran"] = {
pos = Vector(-397,-60,0), pos = Vector(397-13.1,60,0),
ang = Angle(0,180,70), ang = Angle(0,0,70),
width = 1000, width = 1000,
height = 600, height = 600,
scale = 0.0625, scale = 0.0625,
@@ -976,7 +976,7 @@ function ENT:Think()
self:HidePanel("couch_cap_o",not capOpened) self:HidePanel("couch_cap_o",not capOpened)
self:HidePanel("AV_S",not capOpened) self:HidePanel("AV_S",not capOpened)
self:HidePanel("AV_T",not capOpened) self:HidePanel("AV_T",not capOpened)
self:HidePanel("Stopkran",not capOpened) -- self:HidePanel("Stopkran",not capOpened)
self:ShowHide("otsek_cap_r",not capOpened) self:ShowHide("otsek_cap_r",not capOpened)
self:ShowHide("brake334",capOpened and not c013) self:ShowHide("brake334",capOpened and not c013)
self:ShowHide("brake013",capOpened and c013) self:ShowHide("brake013",capOpened and c013)

View File

@@ -11,7 +11,7 @@ ENT.SyncTable = {
"AV3","AV4","AV5","A81","AV6","A80","A18", "AV3","AV4","AV5","A81","AV6","A80","A18",
"VB","GV", "VB","GV",
"DriverValveBLDisconnect","DriverValveTLDisconnect","ParkingBrake", "DriverValveBLDisconnect","DriverValveTLDisconnect","ParkingBrake",
"A84","BPSNon","ConverterProtection","L_1","OtklBV","Start","VozvratRP" "A84","BPSNon","ConverterProtection","L_1","OtklBV","Start","VozvratRP","EmergencyBrakeValve"
} }
function ENT:Initialize() function ENT:Initialize()

View File

@@ -368,8 +368,8 @@ ENT.ClientSounds["RearBrakeLineIsolation"] = {{"RearBrake",function() return "di
ENT.ClientSounds["RearTrainLineIsolation"] = {{"RearTrain",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}} ENT.ClientSounds["RearTrainLineIsolation"] = {{"RearTrain",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}}
ENT.ButtonMap["GV"] = { ENT.ButtonMap["GV"] = {
pos = Vector(170-3-9.5+22,50+20,-60+2+5), pos = Vector(-165,-50+20-40,-60+2),
ang = Angle(0,225-15,90), ang = Angle(0,225-15-180,90),
width = 260, width = 260,
height = 260, height = 260,
scale = 0.1, scale = 0.1,
@@ -384,20 +384,21 @@ ENT.ButtonMap["GV"] = {
} }
ENT.ClientProps["gv"] = { ENT.ClientProps["gv"] = {
model = "models/metrostroi/81-717/gv.mdl", model = "models/metrostroi/81-717/gv.mdl",
pos = Vector(153.5-3-9.5+22,36+20,-78+2+5), pos = Vector(-153.5,36+20-115,-78+3),
ang = Angle(-90,90,-90), ang = Angle(-90,90-180,-90),
color = Color(150,255,255),
hide = 0.5, hide = 0.5,
} }
ENT.ClientProps["gv_wrench"] = { ENT.ClientProps["gv_wrench"] = {
model = "models/metrostroi_train/reversor/reversor_classic.mdl", model = "models/metrostroi_train/reversor/reversor_classic.mdl",
pos = ENT.ClientProps["gv"].pos, pos = ENT.ClientProps["gv"].pos,
ang = Angle(-90,0,0), ang = Angle(-90,180,0),
hide = 0.5, hide = 0.5,
} }
ENT.ButtonMap["AirDistributor"] = { ENT.ButtonMap["AirDistributor"] = {
pos = Vector(-185,-68,-50), pos = Vector(185,68,-50),
ang = Angle(0,0,90), ang = Angle(0,180,90),
width = 170, width = 170,
height = 80, height = 80,
scale = 0.1, scale = 0.1,