Updates

LiliaFramework · Sep 28, 2023 · 592cd59 · 592cd59
1 parent f08dcbb
commit 592cd59
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 109 deletions.
diff --git a/.github/workflows/lua_checker.yml b/.github/workflows/lua_checker.yml
@@ -2,7 +2,7 @@ name: LUA Checker
 on: [push, pull_request]
 
 jobs:
-  linter:
+  LuaChecker:
     runs-on: ubuntu-latest
 
     steps:

diff --git a/gamemode/commands/sv_management.lua b/gamemode/commands/sv_management.lua
@@ -313,7 +313,7 @@ lia.command.add(
 )
 
 --------------------------------------------------------------------------------------------------------
-for _, v in pairs(lia.config.ServerURLs) do
+for k, v in pairs(lia.config.ServerURLs) do
     lia.command.add(
         k,
         {

diff --git a/gamemode/config.lua b/gamemode/config.lua
@@ -249,71 +249,24 @@ if not lia.config.WasInitialized then
             ["lia_cheapblur"] = "1",
         },
         RemovableHooks = {
-            ["StartChat"] = {
-                "StartChatIndicator",
-            },
-            ["FinishChat"] = {
-                "EndChatIndicator",
-            },
-            ["PostPlayerDraw"] = {
-                "DarkRP_ChatIndicator",
-            },
-            ["CreateClientsideRagdoll"] = {
-                "DarkRP_ChatIndicator",
-            },
-            ["player_disconnect"] = {
-                "DarkRP_ChatIndicator",
-            },
-            ["PostDrawEffects"] = {
-                "RenderWidgets",
-                "RenderHalos"",
-            },
-            ["PlayerTick"] = {
-                "TickWidgets",
-            },
-            ["PlayerInitialSpawn"] = {
-                "PlayerAuthSpawn",
-            },
-            ["RenderScene"] = {
-                "RenderStereoscopy",
-                "RenderSuperDoF",
-            },
-            ["LoadGModSave"] = {
-                "LoadGModSave",
-            },
-            ["RenderScreenspaceEffects"] = {
-                "RenderColorModify",
-                "RenderBloom",
-                "RenderToyTown",
-                "RenderTexturize",
-                "RenderSunbeams",
-                "RenderSobel",
-                "RenderSharpen",
-                "RenderMaterialOverlay",
-                "RenderMotionBlur",
-                "RenderBokeh",
-            },
-            ["GUIMousePressed"] = {
-                "SuperDOFMouseDown",
-            },
-            ["GUIMouseReleased"] = {
-                "SuperDOFMouseUp",
-            },
-            ["PreventScreenClicks"] = {
-                "SuperDOFPreventClicks",
-            },
-            ["PostRender"] = {
-                "RenderFrameBlend",
-            },
-            ["PreRender"] = {
-                "PreRenderFrameBlend",
-            },
-            ["Think"] = {
-                "DOFThink",
-            },
-            ["NeedsDepthPass"] = {
-                "NeedsDepthPass_Bokeh",
-            },
+            ["StartChat"] = {"StartChatIndicator",},
+            ["FinishChat"] = {"EndChatIndicator",},
+            ["PostPlayerDraw"] = {"DarkRP_ChatIndicator",},
+            ["CreateClientsideRagdoll"] = {"DarkRP_ChatIndicator",},
+            ["player_disconnect"] = {"DarkRP_ChatIndicator",},
+            ["PostDrawEffects"] = {"RenderWidgets", "RenderHalos",},
+            ["PlayerTick"] = {"TickWidgets",},
+            ["PlayerInitialSpawn"] = {"PlayerAuthSpawn",},
+            ["RenderScene"] = {"RenderStereoscopy", "RenderSuperDoF",},
+            ["LoadGModSave"] = {"LoadGModSave",},
+            ["RenderScreenspaceEffects"] = {"RenderColorModify", "RenderBloom", "RenderToyTown", "RenderTexturize", "RenderSunbeams", "RenderSobel", "RenderSharpen", "RenderMaterialOverlay", "RenderMotionBlur", "RenderBokeh",},
+            ["GUIMousePressed"] = {"SuperDOFMouseDown",},
+            ["GUIMouseReleased"] = {"SuperDOFMouseUp",},
+            ["PreventScreenClicks"] = {"SuperDOFPreventClicks",},
+            ["PostRender"] = {"RenderFrameBlend",},
+            ["PreRender"] = {"PreRenderFrameBlend",},
+            ["Think"] = {"DOFThink",},
+            ["NeedsDepthPass"] = {"NeedsDepthPass_Bokeh",},
         },
         ServerURLs = {
             ["Discord"] = "https://discord.gg/52MSnh39vw",

diff --git a/modules/bodygrouper/derma/cl_bodygrouper.lua b/modules/bodygrouper/derma/cl_bodygrouper.lua
@@ -42,9 +42,9 @@ function PANEL:Init()
     end
 
     local defaultColor = lia.config.Color
-    local h, s, v = ColorToHSV(defaultColor)
-    s = s * 0.25
-    local finalOutlineColor = HSVToColor(h, s, v)
+    local hue, saturation, value = ColorToHSV(defaultColor)
+    saturation = saturation * 0.25
+    local finalOutlineColor = HSVToColor(hue, saturation, value)
     self.finish = self.side:Add("DButton")
     self.finish:Dock(BOTTOM)
     self.finish:DockMargin(0, 5, 0, 0)
@@ -61,14 +61,14 @@ function PANEL:Init()
     self.finish.DoClick = function(this)
         local model = self.model.Entity
         if IsValid(model) then
-            local skn = model:GetSkin()
+            local skin = model:GetSkin()
             local groups = {}
             for i = 0, model:GetNumBodyGroups() - 1 do
                 groups[i] = model:GetBodygroup(i)
             end
 
             local makeChange = true
-            if self.originalSkin == skn then
+            if self.originalSkin == skin then
                 makeChange = false
             end
 
@@ -84,7 +84,7 @@ function PANEL:Init()
             if makeChange then
                 net.Start("BodygrouperMenu")
                 net.WriteEntity(self:GetTarget())
-                net.WriteUInt(skn, 10)
+                net.WriteUInt(skin, 10)
                 net.WriteTable(groups)
                 net.SendToServer()
             end

diff --git a/modules/crashscreen/derma/cl_crashscreen.lua b/modules/crashscreen/derma/cl_crashscreen.lua
@@ -1,42 +1,7 @@
 --------------------------------------------------------------------------------------------------------
 local PANEL = {}
-local waits = {}
 --------------------------------------------------------------------------------------------------------
-function PANEL:Init()
-    local screenWidth, screenHeight = ScrW(), ScrH()
-    self:SetSize(screenWidth, screenHeight)
-    self:Center()
-    self:MoveToFront()
-    self:SetAlpha(0)
-    self:AlphaTo(255, 1.2)
-    local function wait(s, f)
-        table.insert(waits, {SysTime() + s, function() if IsValid(self) then f() end end})
-    end
-
-    wait(
-        3.33,
-        function()
-            http.Fetch(
-                "http://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=" .. game.GetIPAddress(),
-                function(json)
-                    if not IsValid(self) then return end
-                    local data = util.JSONToTable(json)
-                    if not data["response"]["servers"] or not data["response"]["servers"][0] then
-                        self.ServerIsOff = true
-                        self:DoLamar()
-                    else
-                        self.ServerIsOff = false
-                    end
-                end,
-                function()
-                    if not IsValid(self) then return end
-                    self.ServerIsOff = false
-                end
-            )
-        end
-    )
-end
-
+local waits = {}
 --------------------------------------------------------------------------------------------------------
 function PANEL:DoLamar()
     local function wait(s, f)
@@ -111,6 +76,41 @@ function PANEL:DoLamar()
         end
     )
 end
+--------------------------------------------------------------------------------------------------------
+function PANEL:Init()
+    local screenWidth, screenHeight = ScrW(), ScrH()
+    self:SetSize(screenWidth, screenHeight)
+    self:Center()
+    self:MoveToFront()
+    self:SetAlpha(0)
+    self:AlphaTo(255, 1.2)
+    local function wait(s, f)
+        table.insert(waits, {SysTime() + s, function() if IsValid(self) then f() end end})
+    end
+
+    wait(
+        3.33,
+        function()
+            http.Fetch(
+                "http://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=" .. game.GetIPAddress(),
+                function(json)
+                    if not IsValid(self) then return end
+                    local data = util.JSONToTable(json)
+                    if not data["response"]["servers"] or not data["response"]["servers"][0] then
+                        self.ServerIsOff = true
+                        self:DoLamar()
+                    else
+                        self.ServerIsOff = false
+                    end
+                end,
+                function()
+                    if not IsValid(self) then return end
+                    self.ServerIsOff = false
+                end
+            )
+        end
+    )
+end
 
 --------------------------------------------------------------------------------------------------------
 function PANEL:Think()