From 5037ae93c1be174e24bc9ec9d3bcee32299097ca Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Sun, 17 Mar 2024 15:52:59 +0500 Subject: [PATCH] Remove Beatrun_HUDReticle Adjusted sliding strafing speed Fixed random error on deathmatch/datatheft spawn Remove unused materials and code Update RU and EN localizations FOV lines --- .../materials/vgui/hud/crosshair_reaction.vmt | 6 ------ .../materials/vgui/hud/crosshair_reaction.vtf | Bin 1232 -> 0 bytes .../materials/vgui/hud/crosshair_weapon.vmt | 6 ------ .../materials/vgui/hud/crosshair_weapon.vtf | Bin 16592 -> 0 bytes .../localization/en/beatrun.properties | 2 +- .../localization/ru/beatrun.properties | 2 +- .../entities/weapons/runnerhands/shared.lua | 2 +- beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua | 8 ++++---- .../gamemode/player_class/player_beatrun.lua | 19 +++++++++--------- .../gamemodes/beatrun/gamemode/sh/Sliding.lua | 6 +++--- 10 files changed, 20 insertions(+), 31 deletions(-) delete mode 100644 beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vmt delete mode 100644 beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vtf delete mode 100644 beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vmt delete mode 100644 beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vtf diff --git a/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vmt b/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vmt deleted file mode 100644 index 053048f..0000000 --- a/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vmt +++ /dev/null @@ -1,6 +0,0 @@ -"UnlitGeneric" -{ - "$basetexture" "vgui/hud/crosshair_reaction" - "$ignorez" 1 - "$translucent" 1 -} diff --git a/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vtf b/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_reaction.vtf deleted file mode 100644 index d28fc5ca41f74d253f7c75efdc5d03797a36b973..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 zcmbtSJxjw-6urrk&{hce0gf((F0K(o5)_;q9K@}QQ-4FD5O=}Fp;PHt0;Nvf1P5m= z^bd3sCx;G!F3)@N-fPUI6fp_s-Ft4%{dh0$_U4j2B61nmjDX+xh{$0d&(q;SC9E!`KxD5V54=G!3kl5fk!H>sCAqpx|I zI?q;`M%c9M{W8ITLYT%48^?Aygs)reD*^F_<0s~ zM+$&%>a6FJHIR>aS?8PFCHo5C8cS2dhi20ZI46@Iq9^i{ddOjFAQnOct?XYlzv}!| p&ky@S4c?>0AOBy~`%~oWd-ebOYxCv5DRbFR^5Q<1^K87V{{cCV%`X4| diff --git a/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vmt b/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vmt deleted file mode 100644 index a523762..0000000 --- a/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vmt +++ /dev/null @@ -1,6 +0,0 @@ -"UnlitGeneric" -{ - "$basetexture" "vgui/hud/crosshair_standard" - "$ignorez" 1 - "$translucent" 1 -} diff --git a/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vtf b/beatrun/gamemodes/beatrun/content/materials/vgui/hud/crosshair_weapon.vtf deleted file mode 100644 index 03d03b7ac62fbe236e6174dc21a46e2236913f10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16592 zcmeI1zfM#^6vh|V#4SWgB%!th1zlO96<{Hh2=PxKF+6}2^fo?#Bw{5!l?#^InSCQF zvL&A1FyGB_a+giC*jbq&hckQb+?n~lbMDN!bKksLYusuy8aGT{nym77ztNbmI%Ruv zdil%x^fLO=@^R(1RVF6w-_(?vU0%X&^4iKoE76JlSO0nIe6ra@@9y_{X?yI==HxlL z*W2H%t|$GZcDr0kVW2Qj7$^)B1_}d(fxzHht9Gd)$LLFO&Hc`TTW*h4gv4HE7$u|Q7);$yOu0^4a?aph< zYdFA-Z0@|>=^P&)2kH0w9WS!e#@cR~z`=p_F=ujj%t!$H3zH+^KIxuxE-o(q!0hp> zP8-^a2l_A}PR50Udp6g1CLcC7Hdao*pFTBA?I@2;FPJ%?OnRu>P%L!0%0G2&Q^IdTq|g9&@q0c$q%G!gdsh+8<}fx6eKr)|^@4yyGa z?hDEfa=>5tKJIbC4|c`-Apd)NT^$bS1Nt1w-0mfh~8}qXXdekN4 z?hZfL<##`S;Y)e&c7H9sH>`yY|9b<@*rP7t-Oc5%gYYY+rG;BKWfupsOIP?A%Rqyj z7#MZo9d<3juQ^K#lQ4R_zlL3HWLMj;4r(06H2E=V@No|7Hm@bb=8vB=XK7*b`200* zSKD#HulV=)>z@A3@)c?7}zt%tDXPq8|UwAyuy1LqVUEz=Ge=h6al05_L ze;$7w2X#2H38Sye=5?0)UrqkQyRP;Ce0CLXVV3rIeVu;DsmQIe%6}sM@b2UC-{32o zD?Ft5!Ij$lZ;zY0u!FyyVg6h9{^QR(yl;J7JfwKj-@=dY7c+eSN#B2U-lgZj$3Tj0 z*l+Gt+-Ldz>+%oIB#wrhe+-aqQUFRrh`eqE1Y|cL%{z2zo_)sEzS82sNexDcq zh&|`?FQ|Zn^!)RQ;o#X72VRQ@`I~D2cf4oO`91gZPlZBy{>^z99Eb<@265o`32gj^ zE6z|BB2x^pfFGvC=3(^ V3Im0K!a!l5Fi;pM4E$#d{03$74*&oF diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties index 081d8e2..d6e24f6 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties @@ -113,7 +113,7 @@ beatrun.toolsmenu.hud.wind=Wind Effect beatrun.toolsmenu.hud.winddesc=Wind noises when running beatrun.toolsmenu.hud.fov=FOV -beatrun.toolsmenu.hud.fovdesc=You need to respawn after changing your FOV! +beatrun.toolsmenu.hud.fovdesc=Changes your Field Of View beatrun.toolsmenu.hud.hidden=Hide HUD beatrun.toolsmenu.hud.hiddendesc=0 - Shown\n1 - Gamemode only\n2 - Hidden diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties index 029f8e4..8cba7ec 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties @@ -113,7 +113,7 @@ beatrun.toolsmenu.hud.wind=Эффект Ветра beatrun.toolsmenu.hud.winddesc=Шум ветра во время бега beatrun.toolsmenu.hud.fov=Угол Обзора -beatrun.toolsmenu.hud.fovdesc=Вам нужно сделать респавн после изменения FOV! +beatrun.toolsmenu.hud.fovdesc=Изменяет ваш Угол Обзора beatrun.toolsmenu.hud.hidden=Скрыть HUD beatrun.toolsmenu.hud.hiddendesc=0 - Показать\n1 - Только режим\n2 - Скрыть полностью diff --git a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua index 6d19214..7f76eec 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua @@ -7,7 +7,7 @@ if CLIENT then SWEP.Slot = 0 SWEP.SlotPos = 1 SWEP.DrawAmmo = false - SWEP.DrawCrosshair = false + SWEP.DrawCrosshair = true hook.Add("VManipPrePlayAnim", "LOCNoVManip", function() if LocalPlayer():UsingRH() or blinded then return false end diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua b/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua index 928ebda..63a2886 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua @@ -2,7 +2,7 @@ local showtotalXP = CreateClientConVar("Beatrun_HUDXP", "1", true, false, langua local sway = CreateClientConVar("Beatrun_HUDSway", "1", true, false, language.GetPhrase("beatrun.convars.hudsway"), 0, 1) local dynamic = CreateClientConVar("Beatrun_HUDDynamic", "0", true, false, language.GetPhrase("beatrun.convars.huddynamic"), 0, 1) local hidden = CreateClientConVar("Beatrun_HUDHidden", "0", true, false, language.GetPhrase("beatrun.convars.hudhidden"), 0, 2) -local reticle = CreateClientConVar("Beatrun_HUDReticle", "1", true, false, language.GetPhrase("beatrun.convars.hudreticle"), 0, 1) +-- local reticle = CreateClientConVar("Beatrun_HUDReticle", "1", true, false, language.GetPhrase("beatrun.convars.hudreticle"), 0, 1) CreateClientConVar("Beatrun_HUDTextColor", "255 255 255 255", true, true, language.GetPhrase("beatrun.convars.hudtextcolor")) CreateClientConVar("Beatrun_HUDCornerColor", "20 20 20 100", true, true, language.GetPhrase("beatrun.convars.hudcornercolor")) @@ -532,10 +532,9 @@ end hook.Add("Tick", "SpeedGraph", RecordSpeedGraph) +--[[ local crosshair_unarmed = Material("vgui/hud/crosshair_unarmed") local crosshair_standard = Material("vgui/hud/crosshair_standard") --- local crosshair_weapon = Material("vgui/hud/crosshair_weapon") --- local crosshair_reaction = Material("vgui/hud/crosshair_reaction") local function BeatrunReticle() if not reticle:GetBool() then return end @@ -551,4 +550,5 @@ local function BeatrunReticle() surface.DrawTexturedRect(ScrW() * 0.5 - 4, ScrH() * 0.5 - 4, 8, 8) end -hook.Add("HUDPaint", "BeatrunReticle", BeatrunReticle) \ No newline at end of file +hook.Add("HUDPaint", "BeatrunReticle", BeatrunReticle) +--]] \ No newline at end of file diff --git a/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua b/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua index 95d5272..64fc743 100644 --- a/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua +++ b/beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua @@ -124,7 +124,11 @@ function PLAYER:Loadout() if GetGlobalBool("GM_DATATHEFT") or GetGlobalBool("GM_DEATHMATCH") then for _, v in ipairs(DATATHEFT_LOADOUTS[math.random(#DATATHEFT_LOADOUTS)]) do local wep = self.Player:Give(v) - self.Player:GiveAmmo(1000, wep:GetPrimaryAmmoType()) + + timer.Simple(1, function() + if wep:GetPrimaryAmmoType() ~= -1 then self.Player:GiveAmmo(10000, wep:GetPrimaryAmmoType(), true) end + if wep:GetSecondaryAmmoType() ~= -1 then self.Player:GiveAmmo(5, wep:GetSecondaryAmmoType(), true) end + end) end else self.Player:RemoveAllAmmo() @@ -139,12 +143,6 @@ function PLAYER:Loadout() self.Player:SetCanZoom(false) end -hook.Add("PlayerSwitchWeapon", "ResetFOV", function(ply) - local fovmult = (ply:InOverdrive() and 1.1) or 1 - - ply:SetFOV(ply:GetInfoNum("Beatrun_FOV", 120) * fovmult) -end) - function PLAYER:SetModel() BaseClass.SetModel(self) @@ -356,8 +354,11 @@ function PLAYER:CreateMove(cmd) end function PLAYER:CalcView(view) + local fov = GetConVar("Beatrun_FOV"):GetInt() + local mult = (self.Player:InOverdrive() and 1.1) or 1 + if CLIENT then - view.fov = GetConVar("Beatrun_FOV"):GetInt() + view.fov = fov * mult end if self.TauntCam:CalcView(view, self.Player, self.Player:IsPlayingTaunt()) then return true end @@ -508,7 +509,7 @@ hook.Add("PlayerSpawn", "ResetStateTransition", function(ply, transition) if transition and IsValid(ply) then ply:ResetParkourTimes() ply:SetJumpPower(230) - ply:SetFOV(ply:GetInfoNum("Beatrun_FOV", 110)) + ply:SetFOV(ply:GetInfoNum("Beatrun_FOV", 100)) ply:SetCanZoom(false) ply.ClimbingTrace = nil end diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua index 079ed13..6b77f72 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua @@ -563,15 +563,15 @@ hook.Add("SetupMove", "qslide", function(ply, mv, cmd) end end - if not slippery then + if not slippery then -- TODO: Find a way to make proper slide jump. It works on slippery because you are not holding Crouch for slippery objects if mv:KeyDown(IN_MOVELEFT) then local ang = ply:GetSlidingAngle() - ang.y = ang.y + 0.25 + ang.y = ang.y + 0.5 ply:SetSlidingAngle(ang) elseif mv:KeyDown(IN_MOVERIGHT) then local ang = ply:GetSlidingAngle() - ang.y = ang.y - 0.25 + ang.y = ang.y - 0.5 ply:SetSlidingAngle(ang) end