diff --git a/ReadMe.md b/ReadMe.md index e075629..f3d984f 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,4 +1,4 @@ -Репозиторий обновления Metrostroi Subway Simulator 2021 +Репозиторий обновления Metrostroi Subway Simulator 2022 Licensing diff --git a/lua/autorun/metrostroi.lua b/lua/autorun/metrostroi.lua index 1995bdc..8c0d93a 100644 --- a/lua/autorun/metrostroi.lua +++ b/lua/autorun/metrostroi.lua @@ -174,7 +174,7 @@ function Metrostroi.AddSkin(category,name,tbl) if not texture or not texture.defaults then return end for k,v in pairs(texture.defaults) do local id = VGUI[k].ID - print(List:GetOptionData(List:GetSelectedID()),id,VGUI[id],v) + -- print(List:GetOptionData(List:GetSelectedID()),id,VGUI[id],v) if id and VGUI[id] then VGUI[id](v,true) end @@ -339,7 +339,9 @@ end if SERVER then local OSes = { Windows = "win32", + Windows64 = "win64", Linux = "linux", + Linux64 = "linux64", BSD = "linux", POSIX = "linux", OSX = "osx", @@ -360,8 +362,18 @@ if SERVER then else print("Metrostroi: Turbostroi library loaded successfuly.") end - elseif jit.arch ~= "x86" then - ErrorNoHalt("Metrostroi: Unsupported architecture "..jit.arch..".\nTurbostroi works only on x86(32 bit) version of server\n") + elseif jit.arch == "x64" and OSes[jit.os.."64"] and file.Exists(Format("lua/bin/gmsv_turbostroi_%s.dll",OSes[jit.os.."64"]), "GAME") then + if not pcall(require,"turbostroi") then + if system.IsWindows() then + ErrorNoHalt("======================================================\nMetrostroi: Turbostroi library can't be loaded because of missing libraries!\nCheck, that you have Microsoft visual c++ 2010 and 2017 redistributable(x64) installed\nYou can download it from:\n") + MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x64.exe\n") + ErrorNoHalt("======================================================\n") + else + ErrorNoHalt("Metrostroi: Turbostroi library can't be loaded!\n") + end + else + print("Metrostroi: Turbostroi library loaded successfuly.") + end elseif system.IsWindows() then ErrorNoHalt("======================================================\nMetrostroi: Turbostroi DLL not found.\nYou can found turbostroi for Windows at \n") MsgC(Color(255,0,0),"https://metrostroi.net/turbostroi\n") 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 5983d35..e5d11d5 100644 --- a/lua/entities/gmod_subway_81-703_int/cl_init.lua +++ b/lua/entities/gmod_subway_81-703_int/cl_init.lua @@ -1269,7 +1269,7 @@ function ENT:Think() else self.DoorLoopStates[id] = math.Clamp((self.DoorLoopStates[id] or 0) - 6*self.DeltaTime,0,1) end - self:SetSoundState(sid.."r",self.DoorLoopStates[id],0.66+self.DoorLoopStates[id]*0.2) + self:SetSoundState(sid.."r",self.DoorLoopStates[id],0.5+self.DoorLoopStates[id]*0.2) local n_l = "door"..i.."x"..k--.."a" --local n_r = "door"..i.."x"..k.."b" local dlo = 1 @@ -1280,7 +1280,7 @@ function ENT:Think() dlo = self.Anims[n_l].oldspeed/14 end end - self:Animate(n_l,state,0,1, dlo*14,false)--0.8 + (-0.2+0.4*math.random()),0) + self:Animate(n_l,state,0.01,1, dlo*14,false)--0.8 + (-0.2+0.4*math.random()),0) --self:Animate(n_r,state,0,1, dlo*14,false)--0.8 + (-0.2+0.4*math.random()),0) end end diff --git a/lua/entities/gmod_subway_81-714_lvz/init.lua b/lua/entities/gmod_subway_81-714_lvz/init.lua index 5f52ab1..d825644 100644 --- a/lua/entities/gmod_subway_81-714_lvz/init.lua +++ b/lua/entities/gmod_subway_81-714_lvz/init.lua @@ -266,12 +266,6 @@ function ENT:TrainSpawnerUpdate() else self:SetNW2Bool("NewSeats",self:GetNW2Int("SeatType") == 4 or self:GetNW2Int("SeatType") == 3 or self:GetNW2Int("SeatType") == 1 and math.random()>0.5)--(kvr or seats)) self:SetNW2Bool("NewSeatsBlue",self:GetNW2Int("SeatType") == 4 or self:GetNW2Bool("NewSeats") and self:GetNW2Int("SeatType") == 1 and math.random()>0.5) - local typ = self:GetNW2Int("BodyType") - if typ==3 or typ==1 and math.random() > 0.5 then - self:SetModel("models/metrostroi_train/81-717/81-717_spb_int_m.mdl") - else - self:SetModel("models/metrostroi_train/81-717/81-717_spb_int.mdl") - end end self.Pneumatic.ValveType = self:GetNW2Int("Crane",1)+1 self.Announcer.AnnouncerType = self:GetNW2Int("Announcer",1) 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 33b7a42..1add52a 100644 --- a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua +++ b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua @@ -51,12 +51,6 @@ ENT.ClientProps["salon"] = { ang = Angle(0,0,0), hide=2, } -ENT.ClientProps["salon_add"] = { - model = "models/metrostroi_train/81-717/717_spb_features.mdl", - pos = Vector(-48.5,0,0), - ang = Angle(0,0,0), - hide=2, -} ENT.ClientProps["osp_label"] = { model = "models/metrostroi_train/81-717/labels/label_spb1.mdl", pos = Vector(374.470795,42.140141,53.182781), diff --git a/lua/entities/gmod_subway_81-717_lvz/init.lua b/lua/entities/gmod_subway_81-717_lvz/init.lua index 4d6e2c5..9c0de18 100644 --- a/lua/entities/gmod_subway_81-717_lvz/init.lua +++ b/lua/entities/gmod_subway_81-717_lvz/init.lua @@ -435,12 +435,6 @@ function ENT:TrainSpawnerUpdate() else self:SetNW2Bool("NewSeats",self:GetNW2Int("SeatType") == 4 or self:GetNW2Int("SeatType") == 3 or self:GetNW2Int("SeatType") == 1 and math.random()>0.5)--(kvr or seats)) self:SetNW2Bool("NewSeatsBlue",self:GetNW2Int("SeatType") == 4 or self:GetNW2Bool("NewSeats") and self:GetNW2Int("SeatType") == 1 and math.random()>0.5) - local typ = self:GetNW2Int("BodyType") - if typ==3 or typ==1 and math.random() > 0.5 then - self:SetModel("models/metrostroi_train/81-717/81-717_spb_m.mdl") - else - self:SetModel("models/metrostroi_train/81-717/81-717_spb.mdl") - end end self.Pneumatic.ValveType = self:GetNW2Int("Crane",1)+1 self.Announcer.AnnouncerType = self:GetNW2Int("Announcer",1) diff --git a/lua/entities/gmod_subway_81-717_lvz_custom.lua b/lua/entities/gmod_subway_81-717_lvz_custom.lua index 72ed040..e973c6c 100644 --- a/lua/entities/gmod_subway_81-717_lvz_custom.lua +++ b/lua/entities/gmod_subway_81-717_lvz_custom.lua @@ -57,7 +57,6 @@ ENT.Spawner = { Metrostroi.Skins.GetTable("PassTexture","Spawner.PassTexture",false,"pass"), Metrostroi.Skins.GetTable("CabTexture","Spawner.CabTexture",false,"cab"), {}, - {"BodyType","Spawner.717.BodyType","List",{"Spawner.717.Common.Random","Spawner.717.Common.Standart","Spawner.717.Common.Old"}}, {"SeatType","Spawner.717.SeatType","List",{"Spawner.717.Common.Random","Spawner.717.Common.Old","Spawner.717.Common.New","Spawner.717.Common.NewBlue"}}, {}, {"SpawnMode","Spawner.717.SpawnMode","List",{"Spawner.717.SpawnMode.Full","Spawner.717.SpawnMode.Deadlock","Spawner.717.SpawnMode.NightDeadlock","Spawner.717.SpawnMode.Depot"}, nil,function(ent,val,rot,i,wagnum,rclk) 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 3947b05..a279f2d 100644 --- a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua +++ b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua @@ -155,42 +155,12 @@ ENT.ClientProps["handrails_new"] = { hide=1.5, } -ENT.ClientProps["mask22_mvm_wp"] = { - model = "models/metrostroi_train/81-717/mask_22_wp.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} ENT.ClientProps["mask22_mvm"] = { model = "models/metrostroi_train/81-717/mask_22.mdl", pos = Vector(0,0,0), ang = Angle(0,0,0), nohide=true, } -ENT.ClientProps["mask22_glass"] = { - model = "models/metrostroi_train/81-717/mask_22_glass.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} -ENT.ClientProps["mask22_glass_wp"] = { - model = "models/metrostroi_train/81-717/mask_22_glass_wp.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} -ENT.ClientProps["mask222_glass"] = { - model = "models/metrostroi_train/81-717/mask_222_glass.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} -ENT.ClientProps["mask222_glass_wp"] = { - model = "models/metrostroi_train/81-717/mask_222_glass_wp.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} ENT.ClientProps["mask222_mvm_wp"] = { model = "models/metrostroi_train/81-717/mask_spb_222.mdl", pos = Vector(0,0,0), @@ -209,12 +179,6 @@ ENT.ClientProps["mask141_mvm"] = { ang = Angle(0,0,0), nohide=true, } -ENT.ClientProps["mask141_mvm_wp"] = { - model = "models/metrostroi_train/81-717/mask_141_wp.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} ENT.ClientProps["Headlights222_1"] = { model = "models/metrostroi_train/81-717/lamps/headlights_222_group1.mdl", pos = Vector(0,0,0), @@ -227,18 +191,6 @@ ENT.ClientProps["Headlights222_2"] = { ang = Angle(0,0,0), nohide=true, } -ENT.ClientProps["Headlights222_glass_1"] = { - model = "models/metrostroi_train/81-717/lamps/headlights_222_glass_group1.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} -ENT.ClientProps["Headlights222_glass_2"] = { - model = "models/metrostroi_train/81-717/lamps/headlights_222_glass_group2.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} ENT.ClientProps["Headlights141_1"] = { model = "models/metrostroi_train/81-717/lamps/headlights_141_group1.mdl", pos = Vector(0,0,0), @@ -263,18 +215,6 @@ ENT.ClientProps["Headlights22_2"] = { ang = Angle(0,0,0), nohide=true, } -ENT.ClientProps["Headlights22_glass_1"] = { - model = "models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} -ENT.ClientProps["Headlights22_glass_2"] = { - model = "models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.mdl", - pos = Vector(0,0,0), - ang = Angle(0,0,0), - nohide=true, -} ENT.ClientProps["RedLights"] = { model = "models/metrostroi_train/81-717/lamps/redlights.mdl", pos = Vector(0,0,0), @@ -766,6 +706,16 @@ ENT.ButtonMap["Block7"] = { var="KRP",speed=16,vmin=1,vmax=0, sndvol = 0.07,snd = function(val) return val and "button1_on" or "button1_off" end,sndmin = 60,sndmax = 1e3/3,sndang = Angle(-90,0,0), }}, + {ID = "VKSTToggle",x=28,y=58,radius=20,tooltip="",model = { + model = "models/metrostroi_train/81-710/ezh3_tumbler_pp250.mdl",ang = 180,z=-2, + var="VKST",speed=16, + sndvol = 1,snd = function(val) return val and "switch_on" or "switch_off" end, + sndmin = 90,sndmax = 1e3,sndang = Angle(-90,0,0), + }}, + {ID = "!IST", x=43, y=58, radius=8, tooltip="", model = { + lamp = {model = "models/metrostroi_train/81-502/lamps/svetodiod_small_502.mdl",z = -2,color = Color(255,50,45), var="ISTLamp"}, + sprite = {bright=0.5,size=0.25,scale=0.01,color=Color(255,50,45),z=-1.4,} + }}, {ID = "KAHSet",x=43,y=88,radius=20,tooltip="",model = { model = "models/metrostroi_train/81-710/ezh3_button_black.mdl",z = -2, var="KAH",speed=16,vmin=1,vmax=0, @@ -775,7 +725,7 @@ ENT.ButtonMap["Block7"] = { {ID = "KAHKToggle",x=23,y=98,w=40,h=20,tooltip="",model = { model = "models/metrostroi_train/81/krishka.mdl",ang = 0,z = -1, var="KAHK",speed=8,min=0.43,max=0.685,disable="KAHSet", - plomb = {model = "models/metrostroi_train/81/plomb.mdl",ang=135,x=-17,y=-45,z=-0,var="KAHPl",ID="KAHPl",}, + plomb = {model = "models/metrostroi_train/81/plomb.mdl",ang=80,x=15,y=-49,z=-0,var="KAHPl",ID="KAHPl",}, sndvol = 1,snd = function(val) return val and "kr_close" or "kr_open" end, sndmin = 90,sndmax = 1e3,sndang = Angle(-90,0,0), noTooltip = true, @@ -809,6 +759,12 @@ ENT.ButtonMap["Block7"] = { }}, } } +ENT.ClientProps["VKSTIST"] = { + model = "", + pos = Vector(0,0,0), + ang = Angle(0,0,0), + hideseat = 0.5, +} ENT.ButtonMap["Block1"] = { pos = Vector(450.4,28.2,1.3+5.35), @@ -2771,7 +2727,7 @@ function ENT:Think() self:SetLightPower(44,self:GetPackedBool("PanelLights")) self:SetLightPower(45,self:GetPackedBool("PanelLights")) - local mask = self:GetNW2Int("MaskType",2)--self:GetNW2Bool("Mask") + local mask = self:GetNW2Int("MaskType",1)--self:GetNW2Bool("Mask") local HL1 = self:Animate("Headlights1",self:GetPackedBool("Headlights1") and 1 or 0,0,1,6,false) local HL2 = self:Animate("Headlights2",self:GetPackedBool("Headlights2") and 1 or 0,0,1,6,false) local RL = self:Animate("RedLights_a",self:GetPackedBool("RedLights") and 1 or 0,0,1,6,false) @@ -2941,16 +2897,10 @@ function ENT:Think() self:SetLightPower("Lamp_RTM2",dot5 and lamps_rtm > 0,lamps_rtm) if self.MaskType ~= mask then - self:ShowHide("mask22_mvm_wp",mask==1) - self:ShowHide("mask22_mvm",mask==2) - self:ShowHide("mask22_glass_wp",mask==3) - self:ShowHide("mask22_glass",mask==4) - self:ShowHide("mask222_mvm_wp",mask==5) - self:ShowHide("mask222_mvm",mask==6) - self:ShowHide("mask222_glass_wp",mask==7) - self:ShowHide("mask222_glass",mask==8) - self:ShowHide("mask141_mvm_wp",mask==9) - self:ShowHide("mask141_mvm",mask==10) + self:ShowHide("mask22_mvm",mask==1) + self:ShowHide("mask222_mvm_wp",mask==2) + self:ShowHide("mask222_mvm",mask==3) + self:ShowHide("mask141_mvm",mask==4) self:ShowHideSmooth("Headlights222_1",0) self:ShowHideSmooth("Headlights222_2",0) @@ -2958,15 +2908,11 @@ function ENT:Think() self:ShowHideSmooth("Headlights141_2",0) self:ShowHideSmooth("Headlights22_1",0) self:ShowHideSmooth("Headlights22_2",0) - self:ShowHideSmooth("Headlights22_glass_1",0) - self:ShowHideSmooth("Headlights22_glass_2",0) - self:ShowHideSmooth("Headlights222_glass_1",0) - self:ShowHideSmooth("Headlights222_glass_2",0) - if mask >= 9 then + if mask == 4 then self.LightsOverride[30][2] = Vector(465,-48, -23.5) self.LightsOverride[31][2] = Vector(465,48 , -23.5) self.LightsOverride[32][2] = Vector(465,0 , -23.5) - elseif mask < 9 then + elseif mask < 4 then self.LightsOverride[30][2] = Vector(465,-45, -23.5) self.LightsOverride[31][2] = Vector(465,45 , -23.5) self.LightsOverride[32][2] = Vector(465,0 , 52) @@ -2978,19 +2924,13 @@ function ENT:Think() self:ShowHide("1:KVTRSet",not lvz) self:ShowHide("2:KVTSet",lvz) self:ShowHide("2:KVTRSet",lvz) - if mask <= 2 then + if mask == 1 then self:ShowHideSmooth("Headlights22_1",HL1) self:ShowHideSmooth("Headlights22_2",HL2) - elseif mask <= 4 then - self:ShowHideSmooth("Headlights22_glass_1",HL1) - self:ShowHideSmooth("Headlights22_glass_2",HL2) - elseif mask <= 6 then + elseif mask <= 3 then self:ShowHideSmooth("Headlights222_1",HL1) self:ShowHideSmooth("Headlights222_2",HL2) - elseif mask <= 8 then - self:ShowHideSmooth("Headlights222_glass_1",HL1) - self:ShowHideSmooth("Headlights222_glass_2",HL2) - elseif mask <= 10 then + elseif mask == 4 then self:ShowHideSmooth("Headlights141_1",HL1) self:ShowHideSmooth("Headlights141_2",HL2) end @@ -3320,6 +3260,9 @@ function ENT:Think() self:SetSoundState("vent"..i,self.VentG2,1) end end + + self:SetSoundState("IST", self:GetPackedBool("IST") and 1 or 0, 0.95) + if self.RingType ~= self:GetNW2Int("RingType",1) then self.RingType = self:GetNW2Int("RingType",1) self:SetSoundState(self.RingName,0,0) diff --git a/lua/entities/gmod_subway_81-717_mvm/init.lua b/lua/entities/gmod_subway_81-717_mvm/init.lua index 241a84b..eadf909 100644 --- a/lua/entities/gmod_subway_81-717_mvm/init.lua +++ b/lua/entities/gmod_subway_81-717_mvm/init.lua @@ -11,7 +11,7 @@ ENT.SyncTable = { "VZ1","VUD1","KDL","KDLR","KDLK","KDP","KDLRK","DoorSelect", "KRZD","R_VPR","VozvratRP","AVU","KVP","ConverterProtection","RZP",--"SP","GreenRP", "KSN","ARS","ARSR","ALS","OtklAVU","OtklBV","OtklBVK","OVT","L_1","L_2","L_3","VP","DIPoff", - "VMK","BPSNon","RezMK","ARS13","L_4","VUS","VAH","VAD","KRP", + "VMK","BPSNon","RezMK","ARS13","L_4","VUS","VAH","VAD","KRP","VKST", "KAH","KAHK","KDPK", "A53","A56","A54","A17","A44","A39","A70","A14","A74","A26","AR63","AS1","A13","A21","A31","A32","A16","A12","A24","A49","A27","A72","A50","A29","A46","A47","A71","A7","A9","A84","A8","A52","A19","A48","A10","A22","A30","A1","A2","A3","A4","A5","A6","A18","A73","A20","A25","A11","A37","A45","A38","A51","A65","A66","A42","A43","A41","A40","A75","A76","A60","A58","A57","A59","A28", "AV2","AV3","AV4","AV5","AV6","AV1", @@ -448,7 +448,7 @@ function ENT:TrainSpawnerUpdate() local tex = typ[5] and typ[5][math.random(1,#typ[5])] or "Def_717MSKWhite" self:SetNW2String("PassTexture",tex) local mask = typ[6]==true or typ[6] and typ[6](num,tex) - self:SetNW2Int("MaskType",mask and 6 or 1) + self:SetNW2Int("MaskType",mask and 3 or 1) self:SetNW2String("CabTexture",typ[7] and ((lvz and math.random()>0.2) and "Def_ClassicY" or "Def_ClassicG") or ((lvz and math.random()>0.2) and "Def_HammeriteY" or "Def_HammeriteG")) local ARSchance = math.random() self:SetNW2Int("ARSType",(not mask and not self.Dot5 and not lvz or ARSchance>0.8) and (ARSchance>0.93 and 5 or 4) or ARSchance>0.54 and (ARSchance>0.75 and 3 or 2) or 1) @@ -653,6 +653,8 @@ function ENT:Think() self:SetPackedBool("M1_3",Panel.M1_3 > 0) self:SetPackedBool("M4_7",Panel.M4_7 > 0) self:SetPackedRatio("M8",Panel.M8) + self:SetPackedBool("IST",Panel.IST > 0) + self:SetPackedBool("ISTLamp",Panel.IST > 0 and CurTime() % 0.333 > 0.166) self:SetNW2Int("WrenchMode",self.KVWrenchMode) self:SetPackedBool("ReverserPresent",self.KVWrenchMode and self.KVWrenchMode>0) self:SetPackedRatio("CranePosition", Pneumatic.RealDriverValvePosition) diff --git a/lua/entities/gmod_subway_81-717_mvm/shared.lua b/lua/entities/gmod_subway_81-717_mvm/shared.lua index 0fc81a8..77d7823 100644 --- a/lua/entities/gmod_subway_81-717_mvm/shared.lua +++ b/lua/entities/gmod_subway_81-717_mvm/shared.lua @@ -572,6 +572,9 @@ function ENT:InitializeSounds() self.SoundNames["ring_old"] = {loop=0.15,"subway_trains/717/ring/ringo_start.wav","subway_trains/717/ring/ringo_loop.wav","subway_trains/717/ring/ringo_end.mp3"} self.SoundPositions["ring_old"] = {60,1e9,Vector(459,6,10),0.35} + self.SoundNames["IST"] = {loop=true,"subway_trains/717/ring/son17.wav"} + self.SoundPositions["IST"] = {60,1e9,Vector(443.8,0,-3.2),0.15} + self.SoundNames["vpr"] = {loop=0.8,"subway_trains/common/other/radio/vpr_start.wav","subway_trains/common/other/radio/vpr_loop.wav","subway_trains/common/other/radio/vpr_off.wav"} self.SoundPositions["vpr"] = {60,1e9,Vector(420,-49 ,61),0.05} diff --git a/lua/entities/gmod_subway_81-717_mvm_custom.lua b/lua/entities/gmod_subway_81-717_mvm_custom.lua index dd16304..bdfba15 100644 --- a/lua/entities/gmod_subway_81-717_mvm_custom.lua +++ b/lua/entities/gmod_subway_81-717_mvm_custom.lua @@ -55,7 +55,7 @@ ENT.Spawner = { return Schemes end}, {}, - {"MaskType","Spawner.717.MaskType","List",{"2-2","2-2 (M)","2-2 Glass","2-2 Glass (M)","2-2-2","2-2-2 (M)","2-2-2 Glass","2-2-2 Glass (M)","1-4-1","1-4-1 (M)"}}, + {"MaskType","Spawner.717.MaskType","List",{"2-2 (M)","2-2-2","2-2-2 (M)","1-4-1 (M)"}}, {"Cran","Spawner.717.CranType","List",{"334","013"}}, {"Announcer","Spawner.717.Announcer","List",function() local Announcer = {} diff --git a/lua/entities/gmod_subway_base/init.lua b/lua/entities/gmod_subway_base/init.lua index df77f3c..b3dee0e 100644 --- a/lua/entities/gmod_subway_base/init.lua +++ b/lua/entities/gmod_subway_base/init.lua @@ -249,6 +249,7 @@ function ENT:Initialize() -- Overrides for train wire values from wiremod interface and special concommand self.TrainWireOverrides = {} self.TrainWireOutside = {} + self.TrainWireOutsideFrom = {} -- Is this train 'odd' or 'even' in coupled set @@ -268,8 +269,10 @@ function ENT:Initialize() -- Passenger related data (must be set by derived trains to allow boarding) self.LeftDoorsOpen = false --self.LeftDoorsBlocked = false + self.PrevLeftDoorsOpening = false self.RightDoorsOpen = false --self.RightDoorsBlocked = false + self.PrevRightDoorsOpening = false -- Get default train mass if IsValid(self:GetPhysicsObject()) then @@ -796,7 +799,9 @@ end]] -------------------------------------------------------------------------------- function ENT:LeaderReadTrainWire(id) if self.TrainWireOverrides[id] then return self.TrainWireOverrides[id] end - if self.TrainWireOutside[id] then return self.TrainWireOutside[id] end + if self.TrainWireOutside[id] then + return (self.TrainWireOutsideFrom[id] and (self.TrainWireTurbostroi[self.TrainWireOutsideFrom[id]] or 0) or 1)*self.TrainWireOutside[id] + end return (self.TrainWireTurbostroi[id] or 0)+(self.TrainWireWriters[id] or 0) end diff --git a/lua/entities/gmod_track_signs/cl_init.lua b/lua/entities/gmod_track_signs/cl_init.lua index ccd49d9..ece4983 100644 --- a/lua/entities/gmod_track_signs/cl_init.lua +++ b/lua/entities/gmod_track_signs/cl_init.lua @@ -28,7 +28,6 @@ function ENT:Initialize() end function ENT:OnRemove() - print(12323) self:RemoveModels() --self.LightType = 0 --hook.Remove("PostDrawOpaqueRenderables") diff --git a/lua/metrostroi/cl_trainedit.lua b/lua/metrostroi/cl_trainedit.lua index 9599594..1d648d8 100644 --- a/lua/metrostroi/cl_trainedit.lua +++ b/lua/metrostroi/cl_trainedit.lua @@ -284,7 +284,7 @@ local function EditCSEnts() set = set..Format("\tbodygroup = %d,\n",bodygroup) end set = set.."}\n" - print(set) + -- print(set) end,"Print settings","Print LUA part to clipboard and print it") PrSet:Dock(RIGHT) end diff --git a/lua/metrostroi/sv_turbostroi_railnetwork.lua b/lua/metrostroi/sv_turbostroi_railnetwork.lua index 08d02a7..5bf51d4 100644 --- a/lua/metrostroi/sv_turbostroi_railnetwork.lua +++ b/lua/metrostroi/sv_turbostroi_railnetwork.lua @@ -12,7 +12,22 @@ end print("[!] RailNetwork initialized!") -- NEW API local ffi = require("ffi") -local C = ffi.load("gmsv_turbostroi_win32") +local OSName = "gmsv_turbostroi_" + +if jit.os == "Windows" then + OSName = OSName.."win" +elseif jit.os == "Linux" then + OSName = OSName.."linux" +end + +if jit.arch == "x86" then + OSName = OSName.."32" +else + OSName = OSName.."64" +end + +local C = ffi.load(OSName) + ffi.cdef[[ bool RnThreadSendMessage(int ent_id, int id, const char* name, double value); ]] @@ -920,7 +935,7 @@ function Metrostroi.Load(name,keep_signs) -- Create paths definition Metrostroi.Paths = {} if true then return end - print(type(TrackLoadedData)) + -- print(type(TrackLoadedData)) for pathID,path in pairs(TrackLoadedData) do local currentPath = { id = pathID } Metrostroi.Paths[pathID] = currentPath @@ -1114,7 +1129,7 @@ function Metrostroi.Load(name,keep_signs) if auto then for k,v in pairs(auto) do local ent = ents.Create("gmod_track_autodrive_plate") - print(k,v,ent) + -- print(k,v,ent) if IsValid(ent) then ent:SetPos(v.Pos) ent:SetAngles(v.Angles) diff --git a/lua/metrostroi/sv_turbostroi_v2.lua b/lua/metrostroi/sv_turbostroi_v2.lua index 1edc9ec..243cea4 100644 --- a/lua/metrostroi/sv_turbostroi_v2.lua +++ b/lua/metrostroi/sv_turbostroi_v2.lua @@ -79,10 +79,10 @@ if Turbostroi and not TURBOSTROI then if IsValid(Player(index)) then if value==0 then Player(index):PrintMessage( HUD_PRINTCONSOLE, "--START" ) - print("--START") + -- print("--START") end Player(index):PrintMessage( HUD_PRINTCONSOLE, system ) - print(system) + -- print(system) end end, } @@ -155,7 +155,7 @@ if Turbostroi and not TURBOSTROI then if not IsValid(ply) or not ply:IsSuperAdmin() then return end local train = ply:GetTrain() if IsValid(train) then - print(cmd:sub(1,2),cmd:sub(3,4)) + -- print(cmd:sub(1,2),cmd:sub(3,4)) SendMessage(train,6,cmd:sub(1,255),cmd:sub(256,511),ply:UserID(),0) end end) @@ -214,7 +214,23 @@ typedef struct { } thread_msg; thread_msg ThreadRecvMessage(void* p); ]] -local TS = ffi.load("gmsv_turbostroi_win32") + +local OSName = "gmsv_turbostroi_" + +if jit.os == "Windows" then + OSName = OSName.."win" +elseif jit.os == "Linux" then + OSName = OSName.."linux" +end + +if jit.arch == "x86" then + OSName = OSName.."32" +else + OSName = OSName.."64" +end + + +local TS = ffi.load(OSName) Metrostroi = {} local dataCache = {wires = {},wiresW = {},wiresL = {}} diff --git a/lua/metrostroi/sv_util.lua b/lua/metrostroi/sv_util.lua index f346246..42f2303 100644 --- a/lua/metrostroi/sv_util.lua +++ b/lua/metrostroi/sv_util.lua @@ -12,7 +12,6 @@ function Metrostroi.NextWagonID() end Metrostroi.UsedNumbers = Metrostroi.UsedNumbers or {} -hook.Add("EntityRemoved","WagonNumberRemove",Metrostroi.RemoveNumber) function Metrostroi.RemoveNumber(ent) if IsValid(ent) and ent.WagonNumber then local typ = ent.SubwayTrain and ent.SubwayTrain.Type or ent:GetClass() @@ -22,6 +21,7 @@ function Metrostroi.RemoveNumber(ent) tbl[ent.WagonNumber] = nil end end +hook.Add("EntityRemoved","WagonNumberRemove",Metrostroi.RemoveNumber) function Metrostroi.GenerateNumber(train,tbl,func,retry) Metrostroi.RemoveNumber(train) if not tbl or not IsValid(train) then return 0 end @@ -321,7 +321,7 @@ concommand.Add("metrostroi_fail", function(ply, _, args) if train then if IsValid(ply) then ply:PrintMessage(HUD_PRINTCONSOLE,"Generating random failure in your train!") - print("Player "..tostring(ply).." generated random failure in train "..train:EntIndex()) + print(tostring(ply).." generated random failure in train "..train:EntIndex()) else print("Generating random failure in train "..train:EntIndex()) end @@ -355,7 +355,7 @@ concommand.Add("metrostroi_fail_reset", function(ply, _, args) if #trainList > 0 then if IsValid(ply) then ply:PrintMessage(HUD_PRINTCONSOLE,"Reset all failures in your train!") - print("Player "..tostring(ply).." reset all failures in train "..trainList[1]:EntIndex()) + print(tostring(ply).." reset all failures in train "..trainList[1]:EntIndex()) else print("Reset all failures in train "..trainList[1]:EntIndex()) end @@ -390,14 +390,17 @@ concommand.Add("metrostroi_wire", function(ply, _, args) if train then if IsValid(ply) then args[1] = tonumber(args[1]) - if not args[1] then ply:PrintMessage(HUD_PRINTCONSOLE,"Argument must be a number") return end - ply:PrintMessage(HUD_PRINTCONSOLE,"sets outside power in train wire"..args[1].."!") - print("Player "..tostring(ply).." sets outside power in train "..args[1].." wire failure in train "..train:EntIndex()) + if not args[1] then ply:PrintMessage(HUD_PRINTCONSOLE,"1st argument must be a number") return end + if args[2] and not tonumber(args[2]) then ply:PrintMessage(HUD_PRINTCONSOLE,"2nd argument must be a number") return end + args[2] = tonumber(args[2]) + ply:PrintMessage(HUD_PRINTCONSOLE,"sets outside power in train wire"..args[1]..(args[2] and "(from "..args[2].." wire)" or "").."!") + print(tostring(ply).." sets outside power in train "..args[1].." wire"..(args[2] and "(from "..args[2].." wire)" or "").." failure in train number "..train:GetWagonNumber()) else print("sets outside power in train wire "..train:EntIndex()) end --if train.WriteTrainWire then train:WriteTrainWire(args[1],1) end train.TrainWireOutside[args[1]] = 1 + train.TrainWireOutsideFrom[args[1]] = args[2] --if train.WriteTrainWire then train:WriteTrainWire(args[1],1) end else if IsValid(ply) then @@ -426,12 +429,24 @@ concommand.Add("metrostroi_wire_reset", function(ply, _, args) if #trainList > 0 then if IsValid(ply) then - ply:PrintMessage(HUD_PRINTCONSOLE,"reset wire outside power in train!") - print("Player "..tostring(ply).." reset outside power in train ") + if args[1] and not tonumber(args[1]) then ply:PrintMessage(HUD_PRINTCONSOLE,"Argument must be a number") return end + ply:PrintMessage(HUD_PRINTCONSOLE,"reset "..(args[1] and args[1].." " or "").."wire outside power in train!") + print(tostring(ply).." reset "..(args[1] and args[1].." wire " or "").."outside power in train ") else print("Reset outside power in trains ") + end + args[1] = tonumber(args[1]) + if args[1] then + for _,v in pairs(trainList) do + v.TrainWireOutside[args[1]] = nil + v.TrainWireOutsideFrom[args[1]] = nil + end + else + for _,v in pairs(trainList) do + v.TrainWireOutside = {} + v.TrainWireOutsideFrom = {} + end end - for _,v in pairs(trainList) do v.TrainWireOutside = {} end else if IsValid(ply) then ply:PrintMessage(HUD_PRINTCONSOLE,"You must be inside a train!") @@ -453,7 +468,7 @@ concommand.Add("metrostroi_can", function(ply, _, args) if tonumber(args[4]) then value = tonumber(args[4]) end local srcid = tonumber(args[5]) ply:PrintMessage(HUD_PRINTCONSOLE,"Hacking CAN!") - print(Format("Player %s hack CAN(%s->%s:%s %s=%s)",ply,srcid,system,id,name,value)) + print(Format("%s hack CAN(%s->%s:%s %s=%s)",ply,srcid,system,id,name,value)) train:CANWrite("Hacker",srcid or train:GetWagonNumber(),system,id,name,value) end) diff --git a/lua/metrostroi/systems/sys_81_703i_electric.lua b/lua/metrostroi/systems/sys_81_703i_electric.lua index 069aa0f..be3b8c1 100644 --- a/lua/metrostroi/systems/sys_81_703i_electric.lua +++ b/lua/metrostroi/systems/sys_81_703i_electric.lua @@ -335,8 +335,8 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train) local BD = 1-Train.BD.Value if isKVL then Train:WriteTrainWire(15,T[-15]*Train.RD.Value) - Panel.SD = T[-15]*T[15] Train.RD:TriggerInput("Set",BO*Train.BD.Value) + Panel.SD = BO*BD else Train:WriteTrainWire(15,BD*(1-Train.KU11.Value)) Panel.SD = (S["D1"]+BO*Train.KU11.Value)*(T[15]*(1-Train.KU11.Value)+BD) diff --git a/lua/metrostroi/systems/sys_81_717_electric.lua b/lua/metrostroi/systems/sys_81_717_electric.lua index 83b4202..c1bcce0 100644 --- a/lua/metrostroi/systems/sys_81_717_electric.lua +++ b/lua/metrostroi/systems/sys_81_717_electric.lua @@ -88,12 +88,12 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) S["F7"] = S["F"]*KV["F-F7"]+S["14b"]*KRU["11/3-FR1"] Train:WriteTrainWire(5,S["10AK"]*KV["10AK-5"] + KRU["5/3-ZM31"]*-10) - Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]) --[[max(0,min(1,T[4])*KV["4-0"]*-10)KV["4-0"]*-10]] - if T[4]*KV["4-0"] ~= 0 then + Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"] + --[[max(0,min(1,T[4])*KV["4-0"]*-10)]]KV["4-0"]*-10) + if T[4]*KV["4-0"] ~= 0 then Train.A54:TriggerInput("Set",0) Train:WriteTrainWire(5,0) end - --Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]*(1-T[4]*KV["4-0"]*-10)) + --Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]*(1-T[4]*KV["4-0"]*-10)) Panel.LST = T[6]*Train.A40.Value Panel.LhRK = (T[2]+T[-2])*Train.A57.Value @@ -163,7 +163,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) ARS.NGPower = S["7D"]*RC1 Train.BIS200.Power = T[10]*Train.A43.Value*(Train.ALS.Value+Train.ARS.Value) ARS.KB=T[91]*RC1+(ARS.ALS*(1-Train.BSM_GE.Value)+ARS.GE*Train.BSM_GE.Value)*Train.KVT.Value ---]] + --]] S["14bx"] = S["14b"]*Train.KRP.Value S["KRH"] = max(0,T[1])+S["14bx"] ARS.KRH = S["KRH"]*RC1 @@ -457,8 +457,12 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.M8 = S["V2"]*Train.PVK.Value Train.RPvozvrat.VozRpPressed = T[17]~=0 + + Train.C1:TriggerInput("Set", T[1]) + Panel.IST = Train.C1.Value*Train.VKST.Value*T[64] + local ASNP_VV = Train.ASNP_VV - ASNP_VV.Power = BO*Train.AS1.Value*Train.R_ASNPOn.Value + ASNP_VV.Power = T[10]*Train.R_ASNPOn.Value ASNP_VV.AmplifierPower = ASNP_VV.Power*Train.ASNP.LineOut*Train.R_UNch.Value*Train.A26.Value Train:WriteTrainWire(13,ASNP_VV.AmplifierPower) Train:WriteTrainWire(-13,ASNP_VV.AmplifierPower*Train.PowerSupply.X2_2) @@ -467,8 +471,8 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.AnnouncerPlaying = T[13] Panel.AnnouncerBuzz = T[-13]+ASNP_VV.CabinSpeakerPower*Train.PowerSupply.X2_2 Train:WriteTrainWire(14,S["14a"]*(Train.SOT.Value+Train.UOS.Value)*Train.KRP.Value*Train.ROT2.Value) - - Panel.CBKIPower = BO*Train.A76.Value + Panel.PCBKPower = BO + Panel.CBKIPower = Panel.PCBKPower end if self.OldFLARS then Panel.LUDS = ARS.FMM1*Train.AIS.Value @@ -526,7 +530,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Train.KSH2:TriggerInput("Set",S["1R"]) P:TriggerInput("PP",S["3A"]*Train.LK5.Value*C(RK==18)*S["ZR"])--1A-1D else - S["1M"] = C(1<=RK and RK<=5)*S["3A"]+T[10]*Train.KSH2.Value + S["1M"] = C(1<=RK and RK<=5)*S["3A"]+S["10A"]*Train.KSH2.Value S["1R"] = (S["1A"]*C(RK==1)*P.PS + S["1M"]*P.PP)*S["ZR"] Train.KSH1:TriggerInput("Set",S["1R"]) Train.KSH2:TriggerInput("Set",S["1R"]) @@ -620,7 +624,6 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) end if isMVM then Train.BV:TriggerInput("Disable",T[71]*Train.A66.Value) - Panel.PCBKPower = T[10] end Train.RPvozvrat:TriggerInput("Open",S["17A"]) --FIXME Mayve more right RP code -- @@ -856,7 +859,6 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter) Panel.VPR = BO*Train.AR63.Value*Train.R_VPR.Value+B*Train.AV3.Value*Train.R_VPR.Value else Panel.VPR = BO*Train.AR63.Value*Train.R_VPR.Value - Panel.PCBKPower = BO end --BPSN diff --git a/lua/metrostroi/systems/sys_81_717_panel.lua b/lua/metrostroi/systems/sys_81_717_panel.lua index 736e55d..669aeb7 100644 --- a/lua/metrostroi/systems/sys_81_717_panel.lua +++ b/lua/metrostroi/systems/sys_81_717_panel.lua @@ -177,6 +177,9 @@ function TRAIN_SYSTEM:Initialize() self.Train:LoadSystem("KV3","Relay","Switch",{bass=true}) self.Train:LoadSystem("R1","Relay","Switch",{bass=true,close_time=2.3}) + self.Train:LoadSystem("C1","Relay","Switch",{bass=true,close_time=4.5+math.random()}) + self.Train:LoadSystem("VKST","Relay","Switch",{bass=true,normally_closed=true}) + self.V1 = 0 self.LUDS = 0 self.RedLight2 = 0 @@ -234,6 +237,8 @@ function TRAIN_SYSTEM:Initialize() self.CBKIPower = 0 self.PCBKPower = 0 + + self.IST = 0 end @@ -241,7 +246,8 @@ function TRAIN_SYSTEM:Outputs() return { "V1","LUDS","RedLight2","RedLight1","Headlights1","Headlights2","EqLights","CabLights","EqLights","PanelLights","CabinLight","EmergencyLights","MainLights","DoorsLeft","DoorsRight","DoorsW","GreenRP","BrW","AVU","LKVP","RZP","KUP","BrT","LSN","Ring","SD","LST","LVD","LhRK","KVC","SD","TW18", "KT","LEKK", "LKVD","LN","RS","OneFreq","AR04","AR0","AR40","AR60","AR70","AR80","L1","M1_3","M4_7","M8", "AnnouncerPlaying","AnnouncerBuzz","VPR", - "CBKIPower","PCBKPower"} + "CBKIPower","PCBKPower", + "IST"} end TRAIN_SYSTEM.AVMap = { "A11","A17","A44","A26","AR63","A61", diff --git a/lua/metrostroi/systems/sys_81_717_pneumatic.lua b/lua/metrostroi/systems/sys_81_717_pneumatic.lua index 43a1adc..40c3a98 100644 --- a/lua/metrostroi/systems/sys_81_717_pneumatic.lua +++ b/lua/metrostroi/systems/sys_81_717_pneumatic.lua @@ -114,6 +114,8 @@ function TRAIN_SYSTEM:Initialize(parameters) self.DriverValveDisconnectPrevious = 0 -- Doors state + self.DoorLeft = false + self.DoorRight = false if not TURBOSTROI then self.LeftDoorState = { 0,0,0,0 } self.RightDoorState = { 0,0,0,0 } diff --git a/lua/metrostroi/systems/sys_81_718_route_number.lua b/lua/metrostroi/systems/sys_81_718_route_number.lua index 7002644..d1368d9 100644 --- a/lua/metrostroi/systems/sys_81_718_route_number.lua +++ b/lua/metrostroi/systems/sys_81_718_route_number.lua @@ -59,7 +59,7 @@ else self.Reloaded = true local rn = Format("%03d",self.RouteNumber) - print(self.RouteNumber) + -- print(self.RouteNumber) for i=1,2 do if IsValid(scents["route"..i]) then scents["route"..i]:SetSkin(rn[i]) diff --git a/lua/metrostroi/systems/sys_81_71_upo.lua b/lua/metrostroi/systems/sys_81_71_upo.lua index a2fa32c..86095f2 100644 --- a/lua/metrostroi/systems/sys_81_71_upo.lua +++ b/lua/metrostroi/systems/sys_81_71_upo.lua @@ -75,7 +75,7 @@ function TRAIN_SYSTEM:Play(dep) self:AnnQueue(math.Rand(0.0,0.2)) if self.Noise then self:AnnQueue{"noise_start",self.Noise} else self:AnnQueue("noise_end") end self:AnnQueue{math.Rand(0.0,0.2), stbl.tone or "tone"} - if lastst then self:AnnQueue{-1} end + if lastst and not stbl.ignorelast then self:AnnQueue{-1} end self:AnnQueue(msg) self:AnnQueue{math.Rand(0.1,0.4),"noise_end","buzz_end_upo"} if self.Clicks then self:AnnQueue("click2") end diff --git a/lua/metrostroi/systems/sys_81_722_bukp.lua b/lua/metrostroi/systems/sys_81_722_bukp.lua index 02ce486..ba638ec 100644 --- a/lua/metrostroi/systems/sys_81_722_bukp.lua +++ b/lua/metrostroi/systems/sys_81_722_bukp.lua @@ -382,7 +382,6 @@ function TRAIN_SYSTEM:Think(dT) self:CState("CloseDoors",RR and Train.SF7.Value>0 and (Train.DoorClose.Value == 0 or (not self.CloseRing and Train.DoorClose.Value==2 or self.CloseRing and CurTime()-self.CloseRing>4))) self:CState("PassLight",Train.PassLight.Value>0) self:CState("PassVent",Train.PassVent.Value-1) - self:CState("ParkingBrake",Train.ParkingBrake.Value) if BARSPower and Train.BARS.V2 > 0 or not BARSPower and math.abs(self.Speed) < 0.5 and self.PowerCommand < 0 then self.StopV2 = true elseif self.PowerCommand > 0 then diff --git a/lua/metrostroi/systems/sys_81_722_bukv.lua b/lua/metrostroi/systems/sys_81_722_bukv.lua index 753225d..6fe93e7 100644 --- a/lua/metrostroi/systems/sys_81_722_bukv.lua +++ b/lua/metrostroi/systems/sys_81_722_bukv.lua @@ -276,7 +276,6 @@ function TRAIN_SYSTEM:Think() self.EnableMK = (not self:Get("PVU4") and self:Get("Compressor")) and 1 or 0 self.DisableTP = (self:Get("PVU5") or self:Get("PVU6")) and 1 or 0 self.DisablePant = (self:Get("DisablePant") or self:Get("PVU7")) and 1 or 0 - self.ParkingBrake = self:Get("ParkingBrake") local vent = self:Get("PassVent") or 0 if vent==1 then self.VentMode = Train.Pneumatic.WeightLoadRatio>0.6 and 2 or Train.Pneumatic.WeightLoadRatio>0.1 and 1 or 0 diff --git a/lua/metrostroi/systems/sys_81_722_electric.lua b/lua/metrostroi/systems/sys_81_722_electric.lua index 943d893..12d3ac7 100644 --- a/lua/metrostroi/systems/sys_81_722_electric.lua +++ b/lua/metrostroi/systems/sys_81_722_electric.lua @@ -137,6 +137,8 @@ function TRAIN_SYSTEM:Think(dT) Train:WriteTrainWire(30,self.BTB*S["RU"]*C(Panel.Controller<=-1)) Panel.V4 = (S["RVnE"]*C(Train.KRO.Value~=1)+S["RU"])*Train.SF6.Value + Train:WriteTrainWire(11,Panel.V4*Train.ParkingBrake.Value) + Train:WriteTrainWire(31,Panel.V4*(1-Train.ParkingBrake.Value)) Train:WriteTrainWire(-8,BO*min(1,(S["RV"]+S["RU"]))*Train.SF7.Value) Train:WriteTrainWire(9,W[8]*(1-self.CabActive)*C(Train.VRU.Value==1)*Train.SF7.Value) diff --git a/lua/metrostroi/systems/sys_81_722_mfdu.lua b/lua/metrostroi/systems/sys_81_722_mfdu.lua index 255cac8..dad253c 100644 --- a/lua/metrostroi/systems/sys_81_722_mfdu.lua +++ b/lua/metrostroi/systems/sys_81_722_mfdu.lua @@ -271,9 +271,9 @@ if SERVER then if value then lineSel = 2 else - if self.Selected == 1 then self.RouteNumber = self.RouteN end - if self.Selected == 2 then self.StationNumber = self.StationN end - if self.Selected == 3 then self.DriverNumber = self.DriverN end + if self.Selected == 1 then self.RouteN = self.RouteN or self.RouteNumber self.RouteNumber = self.RouteN + elseif self.Selected == 2 then self.StationN = self.StationN or self.StationNumber self.StationNumber = self.StationN + elseif self.Selected == 3 then self.DriverN = self.DriverN or self.DriverNumber self.DriverNumber = self.DriverN end if self.NewActive then if Train.BUKP.Prepared == true then Train.BUKP.Active = 1-Train.BUKP.Active diff --git a/lua/metrostroi/systems/sys_81_722_pneumatic.lua b/lua/metrostroi/systems/sys_81_722_pneumatic.lua index 97fd110..11a6c3b 100644 --- a/lua/metrostroi/systems/sys_81_722_pneumatic.lua +++ b/lua/metrostroi/systems/sys_81_722_pneumatic.lua @@ -42,7 +42,7 @@ function TRAIN_SYSTEM:Initialize() self.Train:LoadSystem("S1","Relay","") --Двери self.V4 = false --Включение РУ - + self.K1 = false self.K2 = false self.SD2 = 0 @@ -436,10 +436,11 @@ function TRAIN_SYSTEM:Think(dT) else self:equalizePressure(dT,"BrakeCylinderPressure", 0.0, 2.00) end - if Train.BUKV.ParkingBrake==0 then - self:equalizePressure(dT,"ParkingBrakePressure", self.TrainLinePressure, 0.4,1,nil,0.5) - else + local w11, w31 = Train:ReadTrainWire(11), Train:ReadTrainWire(31) + if w11*(1-w31) > 0 then self:equalizePressure(dT,"ParkingBrakePressure", 0, 0.4,1,nil,0.5) + elseif w31*(1-w11) > 0 then + self:equalizePressure(dT,"ParkingBrakePressure", self.TrainLinePressure, 0.4,1,nil,0.5) end Train:SetPackedRatio("ParkingBrakePressure_dPdT",self.ParkingBrakePressure_dPdT+0.02) trainLineConsumption_dPdT = trainLineConsumption_dPdT + math.max(0,self.BrakeCylinderPressure_dPdT + self.ParkingBrakePressure_dPdT) diff --git a/lua/metrostroi/systems/sys_als_ars_bis200a.lua b/lua/metrostroi/systems/sys_als_ars_bis200a.lua index 56262b6..3296856 100644 --- a/lua/metrostroi/systems/sys_als_ars_bis200a.lua +++ b/lua/metrostroi/systems/sys_als_ars_bis200a.lua @@ -59,7 +59,7 @@ function TRAIN_SYSTEM:Think(dT) local speed = Train.ALSCoil.Speed --vv При торможении смещение на 2км\ч vv ----[[ - if true or self.SpeedDec then + if self.SpeedDec then Train.BIS_R1:TriggerInput("Set", self.Power*inrange(speed,5.5,11.5 ,3.5 ,14.0 ,Train.BIS_R1.Value > 0)) Train.BIS_R2:TriggerInput("Set", self.Power*inrange(speed,10 ,21.5 ,8.2 ,25.7 ,Train.BIS_R2.Value > 0)) Train.BIS_R3:TriggerInput("Set", self.Power*inrange(speed,20 ,31.5 ,17.6,35.7 ,Train.BIS_R3.Value > 0)) diff --git a/lua/metrostroi_data/languages/en_717.lua b/lua/metrostroi_data/languages/en_717.lua index 2afe629..3813e62 100644 --- a/lua/metrostroi_data/languages/en_717.lua +++ b/lua/metrostroi_data/languages/en_717.lua @@ -63,6 +63,8 @@ Common.717.RZPL = RZP: Power supply protection relay Common.717.VPAOn = VPA: Enable train unit Common.717.VPAOff = VPA: Disable train unit Common.717.VZD = VZD: Door control toggle (close doors) +Common.717.VKST = VKST: Brake status control toggle +Common.717.IST = IST: Brake status indicator Common.717.A53 = A53: Auxiliary circuits contactor Common.717.A56 = A56: Battery @@ -333,6 +335,8 @@ Entities.gmod_subway_81-717_mvm.Buttons.Block7.VAHToggle = @[Comm Entities.gmod_subway_81-717_mvm.Buttons.Block7.KRPSet = @[Common.ALL.KRP] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KAHSet = @[Common.ALL.KAH] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KAHKToggle = @[Common.ALL.KAHK] +Entities.gmod_subway_81-717_mvm.Buttons.Block7.VKSTToggle = @[Common.717.VKST] +Entities.gmod_subway_81-717_mvm.Buttons.Block7.!IST = @[Common.717.IST] Entities.gmod_subway_81-717_mvm.Buttons.Block7.!PNT = @[Common.ALL.BrT] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KDPSet = @[Common.ALL.KDP] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KDPKToggle = @[Common.ALL.KDPK] diff --git a/lua/metrostroi_data/languages/en_base.lua b/lua/metrostroi_data/languages/en_base.lua index 7463453..d735e71 100644 --- a/lua/metrostroi_data/languages/en_base.lua +++ b/lua/metrostroi_data/languages/en_base.lua @@ -195,6 +195,16 @@ Spawner.Close = Close Spawner.Trains1 = Wags. allowed Spawner.Trains2 = Per player Spawner.WagNum = Wagons amount +Spawner.PresetTitle = Presets +Spawner.Preset.New = New preset +Spawner.Preset.Unsaved = Save current preset +Spawner.Preset.NewTooltip = Create +Spawner.Preset.UpdateTooltip = Update +Spawner.Preset.RemoveTooltip = Delete +Spawner.Presets.NamePlaceholder = Preset name +Spawner.Presets.Name = Name +Spawner.Presets.NameError = Invalid name +Spawner.Preset.NotSelected = Preset not selected Common.Spawner.Texture = Body skin Common.Spawner.PassTexture = Interior skin Common.Spawner.CabTexture = Driver's cab skin diff --git a/lua/metrostroi_data/languages/ru_717.lua b/lua/metrostroi_data/languages/ru_717.lua index 0fcf850..08fd5c7 100644 --- a/lua/metrostroi_data/languages/ru_717.lua +++ b/lua/metrostroi_data/languages/ru_717.lua @@ -63,6 +63,8 @@ Common.717.RZPL = РЗП: Сработка реле защиты Common.717.VPAOn = ВПА: Включение поездной аппаратуры Common.717.VPAOff = ВПА: Отключение поездной аппаратуры Common.717.VZD = ВЗД: Выключатель закрытия дверей +Common.717.VKST = ВКСТ: Выключатель контроля состояния тормозов +Common.717.IST = ИСТ: Индикатор состояния тормозов Common.717.A53 = А53: Контактор вспомогательных цепей Common.717.A56 = А56: Аккумуляторная батарея @@ -333,6 +335,8 @@ Entities.gmod_subway_81-717_mvm.Buttons.Block7.VAHToggle = @[Comm Entities.gmod_subway_81-717_mvm.Buttons.Block7.KRPSet = @[Common.ALL.KRP] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KAHSet = @[Common.ALL.KAH] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KAHKToggle = @[Common.ALL.KAHK] +Entities.gmod_subway_81-717_mvm.Buttons.Block7.VKSTToggle = @[Common.717.VKST] +Entities.gmod_subway_81-717_mvm.Buttons.Block7.!IST = @[Common.717.IST] Entities.gmod_subway_81-717_mvm.Buttons.Block7.!PNT = @[Common.ALL.BrT] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KDPSet = @[Common.ALL.KDP] Entities.gmod_subway_81-717_mvm.Buttons.Block7.KDPKToggle = @[Common.ALL.KDPK] diff --git a/lua/metrostroi_data/languages/ru_base.lua b/lua/metrostroi_data/languages/ru_base.lua index fd48489..7d45742 100644 --- a/lua/metrostroi_data/languages/ru_base.lua +++ b/lua/metrostroi_data/languages/ru_base.lua @@ -195,6 +195,16 @@ Spawner.Close = Закрыть Spawner.Trains1 = Разрешено ваг. Spawner.Trains2 = На человека Spawner.WagNum = Количество вагонов +Spawner.PresetTitle = Пресеты +Spawner.Preset.New = Создать новый +Spawner.Preset.Unsaved = Сохранить текущий +Spawner.Preset.NewTooltip = Создать +Spawner.Preset.UpdateTooltip = Обновить +Spawner.Preset.RemoveTooltip = Удалить +Spawner.Presets.NamePlaceholder = Имя пресета +Spawner.Presets.Name = Название +Spawner.Presets.NameError = Ошибка названия +Spawner.Preset.NotSelected = Пресет не выбран Common.Spawner.Texture = Окраска кузова Common.Spawner.PassTexture = Окраска салона Common.Spawner.CabTexture = Окраска кабины diff --git a/materials/models/metrostroi_train/81-717/717_spb_features.vmt b/materials/models/metrostroi_train/81-717/717_spb_features.vmt deleted file mode 100644 index c01da12..0000000 --- a/materials/models/metrostroi_train/81-717/717_spb_features.vmt +++ /dev/null @@ -1,5 +0,0 @@ -"VertexLitGeneric" -{ - "$basetexture" "models/metrostroi_train/81-717/717_spb_features" - "$model" "1" -} diff --git a/materials/models/metrostroi_train/81-717/717_spb_features.vtf b/materials/models/metrostroi_train/81-717/717_spb_features.vtf deleted file mode 100644 index d4d8d4d..0000000 --- a/materials/models/metrostroi_train/81-717/717_spb_features.vtf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9734b4c2f73ba04afbaab6e3795d18492ae760bd820e39a248972b4c1f2d895a -size 5592640 diff --git a/models/metrostroi_train/81-717/717_spb_features.dx80.vtx b/models/metrostroi_train/81-717/717_spb_features.dx80.vtx deleted file mode 100644 index 509974a..0000000 --- a/models/metrostroi_train/81-717/717_spb_features.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42f1a0431a037dd4ff02285ba8fee73a726c262f1334ce06026693825d7ed9f5 -size 48122 diff --git a/models/metrostroi_train/81-717/717_spb_features.dx90.vtx b/models/metrostroi_train/81-717/717_spb_features.dx90.vtx deleted file mode 100644 index 14ad61b..0000000 --- a/models/metrostroi_train/81-717/717_spb_features.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1111aabcb741b1f8ab4387e71c4b4f539f1fd174e02293e6d2b74c413ca1b3f -size 48122 diff --git a/models/metrostroi_train/81-717/717_spb_features.mdl b/models/metrostroi_train/81-717/717_spb_features.mdl deleted file mode 100644 index 372633f..0000000 --- a/models/metrostroi_train/81-717/717_spb_features.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7912cd3020214c9261b093f20a38d0f1a8b24466a3f35cb5c6ab799c44de52 -size 1780 diff --git a/models/metrostroi_train/81-717/717_spb_features.sw.vtx b/models/metrostroi_train/81-717/717_spb_features.sw.vtx deleted file mode 100644 index 6d8f867..0000000 --- a/models/metrostroi_train/81-717/717_spb_features.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4eb5ef8b4bb3b4fd5fc18c743ac60f48ef108f6e99ed72359b9bd516e5ff7d5 -size 48114 diff --git a/models/metrostroi_train/81-717/717_spb_features.vvd b/models/metrostroi_train/81-717/717_spb_features.vvd deleted file mode 100644 index 8408eac..0000000 --- a/models/metrostroi_train/81-717/717_spb_features.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d894b6ff1b73838018a478a73a601a9946b8f3695c0c28b752129139f9e7f899 -size 188992 diff --git a/models/metrostroi_train/81-717/81-717_spb_int_m.dx80.vtx b/models/metrostroi_train/81-717/81-717_spb_int_m.dx80.vtx deleted file mode 100644 index 33d4844..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_int_m.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:917f531861a3a69d214eeeadf9cc7ccefc9a6c7e127c0f9e18a9eca13dad763b -size 789809 diff --git a/models/metrostroi_train/81-717/81-717_spb_int_m.dx90.vtx b/models/metrostroi_train/81-717/81-717_spb_int_m.dx90.vtx deleted file mode 100644 index b3684ff..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_int_m.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:214a9495efdbd9ee44296c60db9642e7946d5090294e38f95caac4048a12bd29 -size 789809 diff --git a/models/metrostroi_train/81-717/81-717_spb_int_m.mdl b/models/metrostroi_train/81-717/81-717_spb_int_m.mdl deleted file mode 100644 index 2d1e8ce..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_int_m.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dcf71d25dc9a208306b076fb7c316268d6732eb592713267ec831336c4f1d59 -size 2736 diff --git a/models/metrostroi_train/81-717/81-717_spb_int_m.phy b/models/metrostroi_train/81-717/81-717_spb_int_m.phy deleted file mode 100644 index 6c7aedf..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_int_m.phy +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8d22522749c6025182dce6a8cd07e745a6886be20af0d212bafa611454dd97d -size 12977 diff --git a/models/metrostroi_train/81-717/81-717_spb_int_m.sw.vtx b/models/metrostroi_train/81-717/81-717_spb_int_m.sw.vtx deleted file mode 100644 index b66a236..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_int_m.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b1bd25bd095059b3e7c4c076aa674b929781208abc15b6e47de94b5122a992e -size 789761 diff --git a/models/metrostroi_train/81-717/81-717_spb_int_m.vvd b/models/metrostroi_train/81-717/81-717_spb_int_m.vvd deleted file mode 100644 index 6661297..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_int_m.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1085f7194ad5a64ad4b7feb3b61ef77537aaf264f1bbd6030c372cba39ad1b9 -size 3527760 diff --git a/models/metrostroi_train/81-717/81-717_spb_m.dx80.vtx b/models/metrostroi_train/81-717/81-717_spb_m.dx80.vtx deleted file mode 100644 index e1e5bc8..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_m.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ac04de6466c7b881773aa6aa96273f23bb76dcbeef59d11085e57e834f2e7a5 -size 694790 diff --git a/models/metrostroi_train/81-717/81-717_spb_m.dx90.vtx b/models/metrostroi_train/81-717/81-717_spb_m.dx90.vtx deleted file mode 100644 index 1b31e13..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_m.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb40b9266e6e74c5371a292f1cfcd20ca0501c442014ca14c98270a47fcd1c20 -size 694790 diff --git a/models/metrostroi_train/81-717/81-717_spb_m.mdl b/models/metrostroi_train/81-717/81-717_spb_m.mdl deleted file mode 100644 index cc31e36..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_m.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88435de363239465237e8b7a03ff58e6cdd0cfca5625298bc1d277794b423896 -size 2340 diff --git a/models/metrostroi_train/81-717/81-717_spb_m.phy b/models/metrostroi_train/81-717/81-717_spb_m.phy deleted file mode 100644 index 742bc2c..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_m.phy +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:087dbf5b4c5442a9a7d596c36ed555005f0de91ab4c1c4e84d88988245b287bf -size 12493 diff --git a/models/metrostroi_train/81-717/81-717_spb_m.sw.vtx b/models/metrostroi_train/81-717/81-717_spb_m.sw.vtx deleted file mode 100644 index a5b877a..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_m.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a45873ba6ae15fb55600a0e01477496a0a06dfd834e7ed1a752cc0b7cf455f21 -size 694758 diff --git a/models/metrostroi_train/81-717/81-717_spb_m.vvd b/models/metrostroi_train/81-717/81-717_spb_m.vvd deleted file mode 100644 index 790bef0..0000000 --- a/models/metrostroi_train/81-717/81-717_spb_m.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74529a1db71dceeef817a8f2656edcf997f8ec8ad53bbf4ed5fd8eaed0ca62dd -size 2991472 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.dx80.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.dx80.vtx deleted file mode 100644 index 11ba6b9..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:767d6aac1ba5b61b9376e8f01a09ba2af76690054f48a780068434a8129ef939 -size 2319 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.dx90.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.dx90.vtx deleted file mode 100644 index ce78dc6..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec50f2897a417bd224997d1112aa4438234fef2de8a36e2f1094212b41a0e453 -size 2319 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.mdl b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.mdl deleted file mode 100644 index 84de20a..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ed682c4a2cd3e5d9d2562c9020e0c25d9a4a538278c66446012925ade8eb60 -size 1808 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.sw.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.sw.vtx deleted file mode 100644 index 2ade479..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1aafa1a83d6f3bd7d64802f1ad71dd4607931d32b8a35895aeb37e9d4f4bcae -size 2311 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.vvd b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.vvd deleted file mode 100644 index 387461d..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:312da63a7e14defdf46baee270500e416783589a221394ea01b05c824d33a49c -size 7360 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.dx80.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.dx80.vtx deleted file mode 100644 index a1ae928..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d7275d72c43171f5afc934fe48aa2935f13488d7aa418d4e3fe35b2d41263c8 -size 2319 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.dx90.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.dx90.vtx deleted file mode 100644 index 7bb64d6..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65018fb339a99e2126d4af6f376202cc96a399b30b6303b629f046ba93eedee0 -size 2319 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.mdl b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.mdl deleted file mode 100644 index 4adbe12..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dccb03db7ca93d212909d802274014878408bf145b2fff449a0034c7bd602941 -size 1808 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.sw.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.sw.vtx deleted file mode 100644 index abbeb17..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67d3828787a7ba6074d82bb4281daa8f7c0aceccce753e6ba0490a71f0fbcfd4 -size 2311 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.vvd b/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.vvd deleted file mode 100644 index b5e3ed9..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00436fafac5c707234d9a3dc4835968145e1189e727cca273d4f4440818a94b8 -size 7360 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.dx80.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.dx80.vtx deleted file mode 100644 index b0d995a..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cc38f5633c5be70090bb5f501bd8a86c49296a787862a385004bd08baf909d4 -size 735 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.dx90.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.dx90.vtx deleted file mode 100644 index abd2b4b..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f1cab3c063f975b8afe2a0e51716c25a82bfc590f31ea4df5450eb146462d1e -size 735 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.mdl b/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.mdl deleted file mode 100644 index 4ea8c47..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d073e09d4893b78239b42c32aa3f8c0a6540f87e311fdac354d5cd3c46ef6455 -size 2392 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.sw.vtx b/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.sw.vtx deleted file mode 100644 index bad13b8..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7054d11dd8a2a11dbb4b054c45974a362c06fbf10e23b87e5924ca3fabf5501c -size 727 diff --git a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.vvd b/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.vvd deleted file mode 100644 index 490481d..0000000 --- a/models/metrostroi_train/81-717/lamps/headlights_22_glass_slim_group1.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddda905c6f7199348041881e2182832a1144aaa2df1c6db342c247dac1ed2ed0 -size 2240 diff --git a/models/metrostroi_train/81-717/mask_141_wp.dx80.vtx b/models/metrostroi_train/81-717/mask_141_wp.dx80.vtx deleted file mode 100644 index 329301d..0000000 --- a/models/metrostroi_train/81-717/mask_141_wp.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:413882d12c6a3fbc54cfafca412592a18f731de946f0caf1577fc677bac96c67 -size 269888 diff --git a/models/metrostroi_train/81-717/mask_141_wp.dx90.vtx b/models/metrostroi_train/81-717/mask_141_wp.dx90.vtx deleted file mode 100644 index 5821179..0000000 --- a/models/metrostroi_train/81-717/mask_141_wp.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:233cfe31ac37234a5af28a35063aae34e8659bf8fc0771cc57e8f73676a7c3ca -size 269888 diff --git a/models/metrostroi_train/81-717/mask_141_wp.mdl b/models/metrostroi_train/81-717/mask_141_wp.mdl deleted file mode 100644 index 1830116..0000000 --- a/models/metrostroi_train/81-717/mask_141_wp.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ed8bdd6ab549651eeedbe3babd5bea0148a96b785c9b2e33554a8edbfc43ea3 -size 1960 diff --git a/models/metrostroi_train/81-717/mask_141_wp.sw.vtx b/models/metrostroi_train/81-717/mask_141_wp.sw.vtx deleted file mode 100644 index 34ef8ea..0000000 --- a/models/metrostroi_train/81-717/mask_141_wp.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6185b124df9591c43c0399dabe5bc85566b1426fafa57e66c9d4018be04a644d -size 269872 diff --git a/models/metrostroi_train/81-717/mask_141_wp.vvd b/models/metrostroi_train/81-717/mask_141_wp.vvd deleted file mode 100644 index 9f2e66e..0000000 --- a/models/metrostroi_train/81-717/mask_141_wp.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87561c19b14bbb05692e30e6ac8c0e3240a5de569bf9e8245d5d868688286374 -size 955488 diff --git a/models/metrostroi_train/81-717/mask_222_glass.dx80.vtx b/models/metrostroi_train/81-717/mask_222_glass.dx80.vtx deleted file mode 100644 index 805fa90..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02d3b68cb1ba0ac51cd6f36f1c08910437bffc9f4abb669e8bb591f154932feb -size 258338 diff --git a/models/metrostroi_train/81-717/mask_222_glass.dx90.vtx b/models/metrostroi_train/81-717/mask_222_glass.dx90.vtx deleted file mode 100644 index bc81460..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5fb48cab0b8f30aebacc27f76c82d4dd70f7be5307fb95376c9cabed8782ef7 -size 258338 diff --git a/models/metrostroi_train/81-717/mask_222_glass.mdl b/models/metrostroi_train/81-717/mask_222_glass.mdl deleted file mode 100644 index 949dfc8..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2273be0ed749a3ac90f2609c89838acbe8a2bcc74ce83e4d7a2cfe030217517e -size 1980 diff --git a/models/metrostroi_train/81-717/mask_222_glass.sw.vtx b/models/metrostroi_train/81-717/mask_222_glass.sw.vtx deleted file mode 100644 index 7a8ff70..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bad2e3092eb1c1d5d983c0e3627602f531abf13ff88bb083373d176353b67a49 -size 258322 diff --git a/models/metrostroi_train/81-717/mask_222_glass.vvd b/models/metrostroi_train/81-717/mask_222_glass.vvd deleted file mode 100644 index 1335c2d..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aecd4e4393148b3a84903e1d78eadefc11aebd53e28a3f805a57771cff71709a -size 914272 diff --git a/models/metrostroi_train/81-717/mask_222_glass_wp.dx80.vtx b/models/metrostroi_train/81-717/mask_222_glass_wp.dx80.vtx deleted file mode 100644 index 4ac958c..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass_wp.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cf79e56c70c24d61c6ffdc8554e9664f43b6221dee949153228f167d11cfafc -size 255632 diff --git a/models/metrostroi_train/81-717/mask_222_glass_wp.dx90.vtx b/models/metrostroi_train/81-717/mask_222_glass_wp.dx90.vtx deleted file mode 100644 index 1b3b855..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass_wp.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c1a9e4a306fecfd4dd30b91dbedc8e3fcfda53343c708788c9d111e70dcb8ba -size 255632 diff --git a/models/metrostroi_train/81-717/mask_222_glass_wp.mdl b/models/metrostroi_train/81-717/mask_222_glass_wp.mdl deleted file mode 100644 index 76e564d..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass_wp.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0147be1394294180d2f4c997abd38ccc6300ccad1dcd15d9583254a910ec9ac -size 1988 diff --git a/models/metrostroi_train/81-717/mask_222_glass_wp.sw.vtx b/models/metrostroi_train/81-717/mask_222_glass_wp.sw.vtx deleted file mode 100644 index 5a24bf4..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass_wp.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6f51a6bcfee92d959884eaf877da2f3a7f3172f2df72152d7f2a9a44e4946b8 -size 255616 diff --git a/models/metrostroi_train/81-717/mask_222_glass_wp.vvd b/models/metrostroi_train/81-717/mask_222_glass_wp.vvd deleted file mode 100644 index 0b6d3fa..0000000 --- a/models/metrostroi_train/81-717/mask_222_glass_wp.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c1e2ee41adc881873607e1c52ffbacbd1ebe2337845ed3120a68f12a84e50b1 -size 903136 diff --git a/models/metrostroi_train/81-717/mask_22_glass.dx80.vtx b/models/metrostroi_train/81-717/mask_22_glass.dx80.vtx deleted file mode 100644 index f51d298..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21add920661df40fba9c86ff4ddfc5d9776a4732c1ec998b258d2ee2897e2a03 -size 259490 diff --git a/models/metrostroi_train/81-717/mask_22_glass.dx90.vtx b/models/metrostroi_train/81-717/mask_22_glass.dx90.vtx deleted file mode 100644 index 15ce6c6..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df03fbc0ee4cb75bdc11395b9710605f70ae8cef900ba89c03da8694ffef0c87 -size 259490 diff --git a/models/metrostroi_train/81-717/mask_22_glass.mdl b/models/metrostroi_train/81-717/mask_22_glass.mdl deleted file mode 100644 index 1c1ee98..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f51bee65c431da2f8e2da77253178a52dbfc2838abf32ed20ad32813f5fdf72d -size 1976 diff --git a/models/metrostroi_train/81-717/mask_22_glass.sw.vtx b/models/metrostroi_train/81-717/mask_22_glass.sw.vtx deleted file mode 100644 index bfaf407..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72fe1325c1972b3d26c3c2ed43d5a5cdb1b050a9d132371ccd0c1cef4e37ef06 -size 259474 diff --git a/models/metrostroi_train/81-717/mask_22_glass.vvd b/models/metrostroi_train/81-717/mask_22_glass.vvd deleted file mode 100644 index 8ff18e0..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd350a4322507186bab08bfd370980e78debd0783dcdb206cca8cbf2c77dc3c0 -size 913888 diff --git a/models/metrostroi_train/81-717/mask_22_glass_wp.dx80.vtx b/models/metrostroi_train/81-717/mask_22_glass_wp.dx80.vtx deleted file mode 100644 index 1129f1d..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass_wp.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30e202c35972587ada64cf04819c74069a1a5f01d6b02e22d92c69cb70857c6d -size 256784 diff --git a/models/metrostroi_train/81-717/mask_22_glass_wp.dx90.vtx b/models/metrostroi_train/81-717/mask_22_glass_wp.dx90.vtx deleted file mode 100644 index e63739e..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass_wp.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:326e449950598dcfd4ea1d9155d142188b10a898cd541d9d589dbee015e86f63 -size 256784 diff --git a/models/metrostroi_train/81-717/mask_22_glass_wp.mdl b/models/metrostroi_train/81-717/mask_22_glass_wp.mdl deleted file mode 100644 index 3a9b3a1..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass_wp.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3343a645f73555c4edb7a0d6bdb0819135dbb1146e551c428388768a6c21e9a8 -size 1984 diff --git a/models/metrostroi_train/81-717/mask_22_glass_wp.sw.vtx b/models/metrostroi_train/81-717/mask_22_glass_wp.sw.vtx deleted file mode 100644 index 17f4880..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass_wp.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:239cadd26382e6e52ce8a85bf10f32065e0487c5cd22fc6626afb599f1d2268f -size 256768 diff --git a/models/metrostroi_train/81-717/mask_22_glass_wp.vvd b/models/metrostroi_train/81-717/mask_22_glass_wp.vvd deleted file mode 100644 index 1299cd6..0000000 --- a/models/metrostroi_train/81-717/mask_22_glass_wp.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55bb593684f7d5838e95400c70d3e1df264858472190096080bb25245f2f15ea -size 902752 diff --git a/models/metrostroi_train/81-717/mask_22_wp.dx80.vtx b/models/metrostroi_train/81-717/mask_22_wp.dx80.vtx deleted file mode 100644 index c791f5e..0000000 --- a/models/metrostroi_train/81-717/mask_22_wp.dx80.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06ac2aba228270a738586b246e39ae2adc061efdc17672ea0b466ab6a64941aa -size 259484 diff --git a/models/metrostroi_train/81-717/mask_22_wp.dx90.vtx b/models/metrostroi_train/81-717/mask_22_wp.dx90.vtx deleted file mode 100644 index da118ad..0000000 --- a/models/metrostroi_train/81-717/mask_22_wp.dx90.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f7bcd74ccc2e8f8e08ef8df2e77f37bc9fc15720cc858d6a3573679b4ee868c -size 259484 diff --git a/models/metrostroi_train/81-717/mask_22_wp.mdl b/models/metrostroi_train/81-717/mask_22_wp.mdl deleted file mode 100644 index f1e2578..0000000 --- a/models/metrostroi_train/81-717/mask_22_wp.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f7b90a0104eb8c80e9eb9e89aaebe620016773948feb33670a019c4ceb78523 -size 1952 diff --git a/models/metrostroi_train/81-717/mask_22_wp.sw.vtx b/models/metrostroi_train/81-717/mask_22_wp.sw.vtx deleted file mode 100644 index 92b3a6a..0000000 --- a/models/metrostroi_train/81-717/mask_22_wp.sw.vtx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7e6811ae6589188e1d751b6b6955575f411af281d87b53e123a858be672d7da -size 259468 diff --git a/models/metrostroi_train/81-717/mask_22_wp.vvd b/models/metrostroi_train/81-717/mask_22_wp.vvd deleted file mode 100644 index 7e7a619..0000000 --- a/models/metrostroi_train/81-717/mask_22_wp.vvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe9a4d2e5690563ab9ca518dd4d3946ae9bcace4ecae8d6d8caad1d4cf980189 -size 917600