From 4a8f7dff5af7aa866a851690cc3278866cf85f20 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Mon, 5 Jun 2023 13:56:55 +0500 Subject: [PATCH 1/6] wow --- beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua b/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua index 6cf9ac0..b2b2a8f 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua @@ -1,14 +1,14 @@ if CLIENT then - PuristMode = CreateClientConVar("Beatrun_PuristMode", "1", true, true, "Purist mode is a clientside preference that severely weakens the ability to strafe while in the air, which is how Mirror's Edge games handle this.\n0 = No restrictions\n1 = Reduced move speed in the air", 0, 1) + CreateClientConVar("Beatrun_PuristMode", "1", true, true, "Purist mode is a clientside preference that severely weakens the ability to strafe while in the air, which is how Mirror's Edge games handle this.\n0 = No restrictions\n1 = Reduced move speed in the air", 0, 1) end local PuristModeForce = CreateConVar("Beatrun_PuristModeForce", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "Force players to adhere to purist rules", 0, 1) local function PuristMove(ply, mv, cmd) - if not ply:OnGround() and not ply:GetGrappling() then - local purist = PuristMode:GetBool() + local PuristMode = ply:GetConVar("Beatrun_PuristMode") - if (purist or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then + if not ply:OnGround() and not ply:GetGrappling() then + if (PuristMode:GetBool() or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then mv:SetForwardSpeed(mv:GetForwardSpeed() * 0.001) mv:SetSideSpeed(mv:GetSideSpeed() * 0.001) From dde82ac56bbd910f451e9d007c6a89f1870b9e70 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Mon, 5 Jun 2023 15:05:26 +0500 Subject: [PATCH 2/6] fixed purist for real --- beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua | 2 +- beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua b/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua index 6ba6f42..8f06d65 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua @@ -225,7 +225,7 @@ local function BeatrunHUD() surface.SetTextPos(scrw * 0.015 + vp.z, scrh * 0.9 + vp.x) surface.DrawText("Lv." .. ply:GetLevel()) - if PuristMode:GetBool() then + if tobool(LocalPlayer():GetInfo("Beatrun_PuristMode")) then surface.SetDrawColor(230, 230, 230) surface.SetMaterial(MELogo) surface.DrawTexturedRect(scrw * 0.00125 + vp.z, scrh * 0.9 + vp.x + SScaleY(16) * 0.25, SScaleX(16), SScaleY(16)) diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua b/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua index b2b2a8f..6b8d045 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua @@ -1,11 +1,11 @@ if CLIENT then - CreateClientConVar("Beatrun_PuristMode", "1", true, true, "Purist mode is a clientside preference that severely weakens the ability to strafe while in the air, which is how Mirror's Edge games handle this.\n0 = No restrictions\n1 = Reduced move speed in the air", 0, 1) + CreateClientConVar("Beatrun_PuristMode", "1", true, true, "Purist mode is a clientside preference that severely weakens the ability to strafe while in the air, which is how Mirror's Edge games handle this.\n0 = No restrictions\n1 = Reduced move speed in the air") end local PuristModeForce = CreateConVar("Beatrun_PuristModeForce", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "Force players to adhere to purist rules", 0, 1) local function PuristMove(ply, mv, cmd) - local PuristMode = ply:GetConVar("Beatrun_PuristMode") + local PuristMode = tobool(ply:GetInfo("Beatrun_PuristMode")) if not ply:OnGround() and not ply:GetGrappling() then if (PuristMode:GetBool() or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then From ab5fed6b3fd51c2481352e85d2a2da46e1835ee5 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Mon, 5 Jun 2023 15:10:41 +0500 Subject: [PATCH 3/6] rar --- beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua b/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua index 6b8d045..ee72b34 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/PuristMode.lua @@ -8,7 +8,7 @@ local function PuristMove(ply, mv, cmd) local PuristMode = tobool(ply:GetInfo("Beatrun_PuristMode")) if not ply:OnGround() and not ply:GetGrappling() then - if (PuristMode:GetBool() or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then + if (PuristMode or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then mv:SetForwardSpeed(mv:GetForwardSpeed() * 0.001) mv:SetSideSpeed(mv:GetSideSpeed() * 0.001) From 4687c740bd0add5a152f95328b7bb70d46549899 Mon Sep 17 00:00:00 2001 From: Nikita <48434875+JonnyBro@users.noreply.github.com> Date: Tue, 6 Jun 2023 00:57:49 +0500 Subject: [PATCH 4/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0fd7449..4109e47 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ There are lua modules, they are for Discord Rich Presence to work, if you want p This version of the beatrun works on any version of the game (Chromium or not). # Installation -**1. Delete or disable VManip (Base) that downloaded from Workshop!** -**2. Delete `beatrun` folder in *addons* if you have one!** +1. Delete or disable VManip (Base) that downloaded from Workshop! +2. Delete `beatrun` folder in *addons* if you have one! 3. Extract `beatrun` and `vmaniprework` folders to *your_game_folder/garrysmod/addons*. 4. Extract `lua` folder to *your_game_folder/garrysmod*. * `lua` folder constains modules for Discord Rich Presense to work. They are open source, visit [this](https://github.com/fluffy-servers/gmod-discord-rpc) to see the source. From 4f0de6b6b4398aafc7e12784947d153d63a64662 Mon Sep 17 00:00:00 2001 From: Nikita <48434875+JonnyBro@users.noreply.github.com> Date: Tue, 6 Jun 2023 00:58:05 +0500 Subject: [PATCH 5/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4109e47..29ab1c1 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ There are lua modules, they are for Discord Rich Presence to work, if you want p This version of the beatrun works on any version of the game (Chromium or not). # Installation -1. Delete or disable VManip (Base) that downloaded from Workshop! -2. Delete `beatrun` folder in *addons* if you have one! +1. **Delete or disable VManip (Base) that downloaded from Workshop!** +2. **Delete `beatrun` folder in *addons* if you have one!** 3. Extract `beatrun` and `vmaniprework` folders to *your_game_folder/garrysmod/addons*. 4. Extract `lua` folder to *your_game_folder/garrysmod*. * `lua` folder constains modules for Discord Rich Presense to work. They are open source, visit [this](https://github.com/fluffy-servers/gmod-discord-rpc) to see the source. From 346aa0cd67217e5bd34ddad2beab915e443ff0b7 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Tue, 6 Jun 2023 09:59:23 +0500 Subject: [PATCH 6/6] added 2 known incompatible addons --- .../gamemodes/beatrun/gamemode/cl/AddonWarning.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua index e69db90..c3cb90f 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua @@ -14,12 +14,6 @@ welcome.outlinecolor = Color(54, 55, 56) welcome.alpha = 0.9 welcome.elements = {} ---[[ -local function closebutton(self) - LocalPlayer():EmitSound("holygrenade.mp3") - AEUI:Clear() -end -]] local function warnclosebutton(self) LocalPlayer():EmitSound("holygrenade.mp3") @@ -31,7 +25,9 @@ end local addons = 0 local warning = Material("vgui/warning.png") -local shit = { +local incompatible = { + ["1581533176"] = true, + ["2675972006"] = true, ["378401390"] = true, ["2027577882"] = true, ["1190705063"] = true, @@ -130,7 +126,7 @@ local function CheckAddons() addons = addons + 1 end - if v.mounted and shit[v.wsid] then + if v.mounted and incompatible[v.wsid] then conflictlist.string = conflictlist.string .. v.title .. "\n" end end