diff --git a/lua/entities/gmod_subway_81-502/cl_init.lua b/lua/entities/gmod_subway_81-502/cl_init.lua index b343945..98ca5bb 100644 --- a/lua/entities/gmod_subway_81-502/cl_init.lua +++ b/lua/entities/gmod_subway_81-502/cl_init.lua @@ -1129,7 +1129,7 @@ ENT.ButtonMap["Speedometer"] = { scale = 0.0625, buttons = { - {ID = "!Speedometer", x=0,y=0,w=100,h=85,tooltip="",tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end}, + {ID = "!Speedometer", x=0,y=0,w=100,h=85,tooltip="",tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end}, } } ENT.ButtonMap["BatteryVoltage"] = { 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 c2e945e..33b7a42 100644 --- a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua +++ b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua @@ -1433,11 +1433,11 @@ ENT.ButtonMap["Block2"] = { {ID = "!SpeedFact1",x=133.1,y=73.6,w=23.7,h=8,tooltip="",model = { name="SpeedFact1",model = "models/metrostroi_train/81-717/lamps/indicators.mdl",z=0.15,color=Color(175,250,20),skin=10,ang=90, - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end }}, {ID = "!SpeedFact2",x=133.1+23.7,y=73.6,w=23.7,h=8,tooltip="",model = { name="SpeedFact2",model = "models/metrostroi_train/81-717/lamps/indicators.mdl",z=0.15,color=Color(175,250,20),skin=10,ang=90, - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end }}, {ID = "!ARSL20",x=140,y=83,w=5,h=10,tooltip="",model = { 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 33979d2..d618dfe 100644 --- a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua +++ b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua @@ -918,7 +918,7 @@ ENT.ButtonMap["Block2_2"] = { buttons = { {ID = "!Speedometer1",x=109,y=18.5,w=13,h=22,tooltip="",model = { name="SSpeed2",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(175,250,20),skin=0,z=-2,ang=Angle(0,0,-90), - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(225,250,20),getfunc= function(ent) if not ent:GetPackedBool("LUDS") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*10)%10] @@ -926,7 +926,7 @@ ENT.ButtonMap["Block2_2"] = { }}, {ID = "!Speedometer2",x=121,y=18.5,w=13,h=22,tooltip="",model = { name="SSpeed1",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(175,250,20),skin=0,z=-2,ang=Angle(0,0,-90), - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(225,250,20),getfunc= function(ent) if not ent:GetPackedBool("LUDS") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*100)%10] @@ -1033,7 +1033,7 @@ ENT.ButtonMap["Block2_3"] = { hideseat=0.2, buttons = { - {ID = "!Speedometer",x=110,y=25,w = 95,h = 50,tooltip="",tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end}, + {ID = "!Speedometer",x=110,y=25,w = 95,h = 50,tooltip="",tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end}, {ID = "!LSD",x=42.5,y=16+17.9*0,w = 35,h = 15,tooltip="",model = { lamp = {model = "models/metrostroi_train/81-717/lamps/oldars_lsd.mdl",z=6,ang=90,var="SD",speed=6} }}, @@ -1129,7 +1129,7 @@ ENT.ButtonMap["Block2_1"] = { buttons = { {ID = "!Speedometer1",x=59.5,y=35.5,w=12,h=20,tooltip="",model = { name="RSpeed2",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(175,250,20),skin=0,z=-2,ang=Angle(0,0,-90), - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(225,250,20),getfunc= function(ent) if not ent:GetPackedBool("LUDS") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*10)%10] @@ -1137,7 +1137,7 @@ ENT.ButtonMap["Block2_1"] = { }}, {ID = "!Speedometer2",x=70.5,y=35.5,w=12,h=20,tooltip="",model = { name="RSpeed1",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(175,250,20),skin=0,z=-2,ang=Angle(0,0,-90), - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(225,250,20),getfunc= function(ent) if not ent:GetPackedBool("LUDS") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*100)%10] diff --git a/lua/entities/gmod_subway_81-718/cl_init.lua b/lua/entities/gmod_subway_81-718/cl_init.lua index 1fe4772..73cdc68 100644 --- a/lua/entities/gmod_subway_81-718/cl_init.lua +++ b/lua/entities/gmod_subway_81-718/cl_init.lua @@ -1263,7 +1263,7 @@ ENT.ButtonMap["ARS"] = { buttons = { {ID = "!Speedometer1", x=107,y=6,w=13,h=22,tooltip="Индикатор скорости", model = { name="SPU_Speed2",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl", color=Color(175,250,20),skin=0,z=1,ang=Angle(0,0,-90), - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(225,250,20),aa=true,getfunc= function(ent) if not ent:GetPackedBool("Speedometer") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*10)%10] @@ -1271,7 +1271,7 @@ ENT.ButtonMap["ARS"] = { }}, {ID = "!Speedometer2", x=118,y=6,w=13,h=22,tooltip="Индикатор скорости", model = { name="SPU_Speed1",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl", color=Color(175,250,20),skin=0,z=1,ang=Angle(0,0,-90), - tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(225,250,20),aa=true,getfunc= function(ent) if not ent:GetPackedBool("Speedometer") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*100)%10] diff --git a/lua/entities/gmod_subway_em509/cl_init.lua b/lua/entities/gmod_subway_em509/cl_init.lua index 4511251..9da4335 100644 --- a/lua/entities/gmod_subway_em509/cl_init.lua +++ b/lua/entities/gmod_subway_em509/cl_init.lua @@ -184,14 +184,14 @@ ENT.ButtonMap["Lamps"] = { lamp = {model = "",bscale=Vector(1.2,0.6,1),z = -45,var="RP",getfunc = function(ent) return math.Clamp((ent:GetPackedRatio("RRP")-0.45)*7,0,1) end} }}, {ID = "!Speedometer1",x=110-6+12,y=9,w=50-24,h=50,tooltip="",model = { - name="Speed2",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(250,50,20),skin=0,z=-40,ang=Angle(0,0,-90), tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + name="Speed2",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(250,50,20),skin=0,z=-40,ang=Angle(0,0,-90), tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(250,50,20),aa=true,getfunc= function(ent) if not ent:GetPackedBool("V1") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*10)%10] end}, }}, {ID = "!Speedometer2",x=110+6+12,y=9,w=50-24,h=50,tooltip="",model = { - name="Speed1",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(250,50,20),skin=0,z=-40,ang=Angle(0,0,-90), tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end, + name="Speed1",model = "models/metrostroi_train/81-717/segments/segment_mvm.mdl",color=Color(250,50,20),skin=0,z=-40,ang=Angle(0,0,-90), tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end, sprite = {bright=0.1,size=.5,scale=0.02,vscale=0.025,z=1,color=Color(250,50,20),aa=true,getfunc= function(ent) if not ent:GetPackedBool("V1") then return 0 end return strength[math.floor(ent:GetPackedRatio("Speed")*100)%10] diff --git a/lua/entities/gmod_subway_ezh/cl_init.lua b/lua/entities/gmod_subway_ezh/cl_init.lua index 392989b..efe6ab2 100644 --- a/lua/entities/gmod_subway_ezh/cl_init.lua +++ b/lua/entities/gmod_subway_ezh/cl_init.lua @@ -1045,7 +1045,7 @@ ENT.ButtonMap["Speedometer"] = { scale = 0.0625, buttons = { - {ID = "!Speedometer", x=0, y=0, w=100, h=70, tooltip="",tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),ent:GetPackedRatio("Speed")*100) end}, + {ID = "!Speedometer", x=0, y=0, w=100, h=70, tooltip="",tooltipFunc = function(ent) return Format(Metrostroi.GetPhrase("Train.Buttons.Speed"),math.floor(ent:GetPackedRatio("Speed")*100)) end}, } }