mirror of
https://github.com/JonnyBro/beatrun.git
synced 2025-01-31 03:57:27 +05:00
Merge branch 'JonnyBro:master' into master
This commit is contained in:
commit
0bc9c7d737
4 changed files with 11 additions and 15 deletions
|
@ -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).
|
This version of the beatrun works on any version of the game (Chromium or not).
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
**1. Delete or disable VManip (Base) that downloaded from Workshop!**
|
1. **Delete or disable VManip (Base) that downloaded from Workshop!**
|
||||||
**2. Delete `beatrun` folder in *addons* if you have one!**
|
2. **Delete `beatrun` folder in *addons* if you have one!**
|
||||||
3. Extract `beatrun` and `vmaniprework` folders to *your_game_folder/garrysmod/addons*.
|
3. Extract `beatrun` and `vmaniprework` folders to *your_game_folder/garrysmod/addons*.
|
||||||
4. Extract `lua` folder to *your_game_folder/garrysmod*.
|
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.
|
* `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.
|
||||||
|
|
|
@ -14,12 +14,6 @@ welcome.outlinecolor = Color(54, 55, 56)
|
||||||
welcome.alpha = 0.9
|
welcome.alpha = 0.9
|
||||||
welcome.elements = {}
|
welcome.elements = {}
|
||||||
|
|
||||||
--[[
|
|
||||||
local function closebutton(self)
|
|
||||||
LocalPlayer():EmitSound("holygrenade.mp3")
|
|
||||||
AEUI:Clear()
|
|
||||||
end
|
|
||||||
]]
|
|
||||||
|
|
||||||
local function warnclosebutton(self)
|
local function warnclosebutton(self)
|
||||||
LocalPlayer():EmitSound("holygrenade.mp3")
|
LocalPlayer():EmitSound("holygrenade.mp3")
|
||||||
|
@ -31,7 +25,9 @@ end
|
||||||
local addons = 0
|
local addons = 0
|
||||||
local warning = Material("vgui/warning.png")
|
local warning = Material("vgui/warning.png")
|
||||||
|
|
||||||
local shit = {
|
local incompatible = {
|
||||||
|
["1581533176"] = true,
|
||||||
|
["2675972006"] = true,
|
||||||
["378401390"] = true,
|
["378401390"] = true,
|
||||||
["2027577882"] = true,
|
["2027577882"] = true,
|
||||||
["1190705063"] = true,
|
["1190705063"] = true,
|
||||||
|
@ -130,7 +126,7 @@ local function CheckAddons()
|
||||||
addons = addons + 1
|
addons = addons + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
if v.mounted and shit[v.wsid] then
|
if v.mounted and incompatible[v.wsid] then
|
||||||
conflictlist.string = conflictlist.string .. v.title .. "\n"
|
conflictlist.string = conflictlist.string .. v.title .. "\n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -225,7 +225,7 @@ local function BeatrunHUD()
|
||||||
surface.SetTextPos(scrw * 0.015 + vp.z, scrh * 0.9 + vp.x)
|
surface.SetTextPos(scrw * 0.015 + vp.z, scrh * 0.9 + vp.x)
|
||||||
surface.DrawText("Lv." .. ply:GetLevel())
|
surface.DrawText("Lv." .. ply:GetLevel())
|
||||||
|
|
||||||
if PuristMode:GetBool() then
|
if tobool(LocalPlayer():GetInfo("Beatrun_PuristMode")) then
|
||||||
surface.SetDrawColor(230, 230, 230)
|
surface.SetDrawColor(230, 230, 230)
|
||||||
surface.SetMaterial(MELogo)
|
surface.SetMaterial(MELogo)
|
||||||
surface.DrawTexturedRect(scrw * 0.00125 + vp.z, scrh * 0.9 + vp.x + SScaleY(16) * 0.25, SScaleX(16), SScaleY(16))
|
surface.DrawTexturedRect(scrw * 0.00125 + vp.z, scrh * 0.9 + vp.x + SScaleY(16) * 0.25, SScaleX(16), SScaleY(16))
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
if CLIENT then
|
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")
|
||||||
end
|
end
|
||||||
|
|
||||||
local PuristModeForce = CreateConVar("Beatrun_PuristModeForce", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "Force players to adhere to purist rules", 0, 1)
|
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 function PuristMove(ply, mv, cmd)
|
||||||
if not ply:OnGround() and not ply:GetGrappling() then
|
local PuristMode = tobool(ply:GetInfo("Beatrun_PuristMode"))
|
||||||
local purist = PuristMode:GetBool()
|
|
||||||
|
|
||||||
if (purist or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then
|
if not ply:OnGround() and not ply:GetGrappling() then
|
||||||
|
if (PuristMode or PuristModeForce:GetBool()) and ply:WaterLevel() == 0 then
|
||||||
mv:SetForwardSpeed(mv:GetForwardSpeed() * 0.001)
|
mv:SetForwardSpeed(mv:GetForwardSpeed() * 0.001)
|
||||||
mv:SetSideSpeed(mv:GetSideSpeed() * 0.001)
|
mv:SetSideSpeed(mv:GetSideSpeed() * 0.001)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue