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

#199 (#267)

Browse Source 
* Global change.
Замена всех устаревших функции на аналогичные

* Global change.
Добавил локальные переменные там, где это было рентабельно.
This commit is contained in:
Ivan Gordeev
2021-07-26 09:18:18 +03:00
committed by GitHub
parent 4a2786967d
commit 373073e661
29 changed files with 121 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lua/weapons/gmod_tool/stools/signalling.lua
View File

@@ -564,7 +564,7 @@ function TOOL:BuildCPanelCustom()
if not CPanel then return end
--("signalling_signaldata",util.TableToJSON(tool.Signal))
--tool.Type = GetConVarNumber("signalling_type") or 1
tool.RouteType = GetConVarNumber("signalling_routetype") or 1
tool.RouteType = GetConVar("signalling_routetype"):GetInt() or 1
CPanel:ClearControls()
CPanel:SetPadding(0)
CPanel:SetSpacing(0)
@@ -1497,9 +1497,9 @@ end
TOOL.NotBuilt = true
function TOOL:Think()
if CLIENT and (self.NotBuilt or NeedUpdate) then
self.Signal = self.Signal or util.JSONToTable(string.Replace(GetConVarString("signalling_signaldata"),"'","\"")) or {}
self.Sign = self.Sign or util.JSONToTable(string.Replace(GetConVarString("signalling_signdata"),"'","\"")) or {}
self.Auto = self.Auto or util.JSONToTable(string.Replace(GetConVarString("signalling_autodata"),"'","\"")) or {}
self.Signal = self.Signal or util.JSONToTable(string.Replace(GetConVar("signalling_signaldata"):GetString(),"'","\"")) or {}
self.Sign = self.Sign or util.JSONToTable(string.Replace(GetConVar("signalling_signdata"):GetString(),"'","\"")) or {}
self.Auto = self.Auto or util.JSONToTable(string.Replace(GetConVar("signalling_autodata"):GetString(),"'","\"")) or {}
self:SendSettings()
self:BuildCPanelCustom()
self.NotBuilt = nil
@@ -1507,7 +1507,8 @@ function TOOL:Think()
end
end
function TOOL.BuildCPanel(panel)
panel:AddControl("Header", { Text = "#Tool.signalling.name", Description = "#Tool.signalling.desc" })
panel:SetName("#Tool.signalling.name")
panel:Help("#Tool.signalling.desc")
if not self then return end
self:BuildCPanelCustom()
end

16
lua/weapons/gmod_tool/stools/switch.lua
View File

@@ -87,12 +87,16 @@ end
function TOOL.BuildCPanel(panel)
panel = panel or controlpanel.Get("switch")
panel:AddControl("Header", { Text = "#Tool.switch.name", Description = "#Tool.switch.desc" })
panel:AddControl("TextBox", { Label = "Name", Command = "switch_name" })
panel:AddControl("ComboBox", { Label = "Channel", Options = {None={switch_channel = 0},["1"] ={switch_channel = 1},["2"] ={switch_channel = 2}}})
panel:AddControl("Checkbox", { Label = "Locked", Command = "switch_locked" })
panel:AddControl("Checkbox", { Label = "Controllable", Command = "switch_controllable" })
panel:AddControl("Checkbox", { Label = "Invert", Command = "switch_invert" })
panel:SetName("#Tool.switch.name")
panel:Help("#Tool.switch.desc")
panel:TextEntry("Name","switch_name")
local CBChannel = panel:ComboBox( "Channel", "switch_channel" )
CBChannel:AddChoice("None",0)
CBChannel:AddChoice("1",1)
CBChannel:AddChoice("2",2)
panel:CheckBox("Locked","switch_locked")
panel:CheckBox("Controllable","switch_controllable")
panel:CheckBox("Invert","switch_invert")
end

15
lua/weapons/gmod_tool/stools/train_spawner.lua
View File

@@ -2,6 +2,8 @@
--local TOOL = player.GetBySteamID("STEAM_0:1:31566374"):GetTool("train_spawner")
TOOL.AddToMenu = false
local C_MaxWagons = GetConVar("metrostroi_maxwagons")
if CLIENT then
language.Add("Tool.train_spawner.name", "Train Spawner")
language.Add("Tool.train_spawner.desc", "Spawn a train")
@@ -162,7 +164,7 @@ function TOOL:Think()
e.GetDirtLevel = function() return 0.25 end
end
hook.Add("Think",self.GhostEntities[1],function()
if not IsValid(self.Owner:GetActiveWeapon()) or self.Owner:GetActiveWeapon():GetClass()~="gmod_tool" or GetConVarString("gmod_toolmode") ~= "train_spawner" then
if not IsValid(self.Owner:GetActiveWeapon()) or self.Owner:GetActiveWeapon():GetClass()~="gmod_tool" or GetConVar("gmod_toolmode"):GetString() ~= "train_spawner" then
self:OnRemove()
end
end)
@@ -440,12 +442,12 @@ function TOOL:LeftClick(trace)
end
if not self.AllowSpawn or not self.Train then return end
if SERVER then
if self.Settings.WagNum > GetConVarNumber("metrostroi_maxwagons") then
self.Settings.WagNum = GetConVarNumber("metrostroi_maxwagons")
if self.Settings.WagNum > C_MaxWagons:GetInt() then
self.Settings.WagNum = C_MaxWagons:GetInt()
end
if Metrostroi.TrainCountOnPlayer(self:GetOwner()) + self.Settings.WagNum > GetConVarNumber("metrostroi_maxtrains_onplayer")*GetConVarNumber("metrostroi_maxwagons")
or Metrostroi.TrainCount() + self.Settings.WagNum > GetConVarNumber("metrostroi_maxtrains")*GetConVarNumber("metrostroi_maxwagons") then
if Metrostroi.TrainCountOnPlayer(self:GetOwner()) + self.Settings.WagNum > GetConVar("metrostroi_maxtrains_onplayer"):GetInt()*C_MaxWagons:GetInt()
or Metrostroi.TrainCount() + self.Settings.WagNum > GetConVar("metrostroi_maxtrains"):GetInt()*C_MaxWagons:GetInt() then
self:GetOwner():LimitHit("train_limit")
return true
end
@@ -500,7 +502,8 @@ function TOOL:RightClick(trace)
end
function TOOL.BuildCPanel(panel)
panel:AddControl("Header", { Text = "#Tool.train_spawner.name", Description = "#Tool.train_spawner.desc" })
panel:SetName("#Tool.train_spawner.name")
panel:Help("#Tool.train_spawner.desc")
end
if SERVER then