diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties index 9372ee5..0b07213 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties @@ -41,9 +41,9 @@ beatrun.convars.disablegrapple=Disables grapple ability beatrun.convars.puristmode=Purist mode is a clientside preference that severely weakens the ability to strafe while in the air, which is how ME games handle this.\n0 = No restrictions\n1 = Reduced move speed in the air beatrun.convars.quickturnground=Enables quickturning with secondary attack while on the ground beatrun.convars.quickturnhandsonly=Enables quickturning with "Runner Hands" only -beatrun.convars.loseSpeedOnRoll=Whether or not the player will lose speed when rolling (similar to ME:Catalyst) -beatrun.convars.showSpeedometer=Nothing to say -beatrun.convars.totsugekiAudio=Enable "Totsugeki" voice +beatrun.convars.rollspeedloss=Whether or not the player will lose speed when rolling +beatrun.convars.showspeedometer=Toggle speedometer visibility +beatrun.convars.totsugekiaudio=Toggle Totsugeki audio # HUD beatrun.hud.course=Course: %s @@ -110,7 +110,10 @@ beatrun.toolsmenu.hud.nametags=Show Nametags beatrun.toolsmenu.hud.nametagsdesc=Toggles nametags above players beatrun.toolsmenu.hud.hudxp=Show HUD XP -beatrun.toolsmenu.hud.hudxpdesc=Show total XP near your nickname +beatrun.toolsmenu.hud.hudxpdesc=Shows total XP near your nickname + +beatrun.toolsmenu.hud.showspeedometer=Show Speedometer +beatrun.toolsmenu.hud.showspeedometerdesc=Shows the speedometer on HUD beatrun.toolsmenu.hud.showSpeedometer=Show Speedometer beatrun.toolsmenu.hud.showSpeedometerDesc=Shows the speedometer on HUD (hiding HUD does not affect visibility) @@ -118,9 +121,6 @@ beatrun.toolsmenu.hud.showSpeedometerDesc=Shows the speedometer on HUD (hiding H beatrun.toolsmenu.hud.wind=Wind Effect beatrun.toolsmenu.hud.winddesc=Wind noises when running -beatrun.toolsmenu.hud.fov=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 @@ -128,13 +128,15 @@ beatrun.toolsmenu.hud.textcolor=HUD Text Color beatrun.toolsmenu.hud.cornercolor=HUD Corner Color beatrun.toolsmenu.hud.floatxpcolor=HUD Floating XP Color -# Tools Menu Viewbob Section -beatrun.toolsmenu.viewbob.name=Camera -beatrun.toolsmenu.viewbob.desc=Camera Settings +# Tools Menu Camera Section +beatrun.toolsmenu.camera.name=Camera +beatrun.toolsmenu.camera.desc=Camera Settings -beatrun.toolsmenu.viewbob.stabilization=Viewbob Stabilization -beatrun.toolsmenu.viewbob.stabilizationdesc=Turn on to reduce motion sickness by making viewbobbing keep the player's look position centered -beatrun.toolsmenu.viewbob.intensity=Viewbob Intensity +beatrun.toolsmenu.camera.stabilization=Viewbob Stabilization +beatrun.toolsmenu.camera.stabilizationdesc=Turn on to reduce motion sickness by making viewbobbing keep the player's look position centered +beatrun.toolsmenu.camera.intensity=Viewbob Intensity +beatrun.toolsmenu.camera.fov=FOV +beatrun.toolsmenu.camera.fovdesc=Changes your Field Of View # Tools Menu Gameplay Section beatrun.toolsmenu.gameplay.name=Gameplay @@ -152,8 +154,8 @@ beatrun.toolsmenu.gameplay.puristmodedesc=Purist mode is a clientside preference beatrun.toolsmenu.gameplay.disablegrapple=Disable Grapple Ability beatrun.toolsmenu.gameplay.disablegrappledesc=Disables grapple ability -beatrun.toolsmenu.gameplay.rollLoseSpeed=Lose Speed on Roll -beatrun.toolsmenu.gameplay.rollLoseSpeedDesc=Literally whether or not the player will lose speed on roll (similar to ME:Catalyst) +beatrun.toolsmenu.gameplay.rollspeedloss=Lose Speed on Roll +beatrun.toolsmenu.gameplay.rollspeedlossdesc=Toggles loss of speed on safety roll # Tools Menu Misc Section beatrun.toolsmenu.misc.name=Misc diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties index c23884c..cee9e70 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/it/beatrun.properties @@ -111,21 +111,21 @@ beatrun.toolsmenu.hud.hudxpdesc=Mostra XP totali vicino al tuo nickname beatrun.toolsmenu.hud.wind=Effetto del vento beatrun.toolsmenu.hud.winddesc=Rumori del vento durante la corsa -beatrun.toolsmenu.hud.fov=FOV -beatrun.toolsmenu.hud.fovdesc=Devi rigenerarti dopo aver cambiato il tuo FOV! - beatrun.toolsmenu.hud.hidden=Nascondi HUD beatrun.toolsmenu.hud.hiddendesc=0 - Mostra\n1 - Solo Modalità di gioco\n2 - Nascosta beatrun.toolsmenu.hud.textcolor=Colore del testo dell'HUD beatrun.toolsmenu.hud.cornercolor=Colore del bordo dell'HUD beatrun.toolsmenu.hud.floatxpcolor=Colore XP mobile dell'HUD -# Tools Menu Viewbob Section -beatrun.toolsmenu.viewbob.name=Viewbob -beatrun.toolsmenu.viewbob.desc=Impostazioni Viewbob -beatrun.toolsmenu.viewbob.stabilization=Stabilizzazione Viewbob -beatrun.toolsmenu.viewbob.stabilizationdesc=Attiva per ridurre la chinetosi facendo in modo che il viewbobbing mantenga centrata la posizione dello sguardo del giocatore -beatrun.toolsmenu.viewbob.intensity=Intensità del Viewbob +# Tools Menu Camera Section +beatrun.toolsmenu.camera.name=Camera +beatrun.toolsmenu.camera.desc=Impostazioni Camera + +beatrun.toolsmenu.camera.stabilization=Stabilizzazione Viewbob +beatrun.toolsmenu.camera.stabilizationdesc=Attiva per ridurre la chinetosi facendo in modo che il viewbobbing mantenga centrata la posizione dello sguardo del giocatore +beatrun.toolsmenu.camera.intensity=Intensità del Viewbob +beatrun.toolsmenu.camera.fov=FOV +beatrun.toolsmenu.camera.fovdesc=Devi rigenerarti dopo aver cambiato il tuo FOV! # Tools Menu Gameplay Section beatrun.toolsmenu.gameplay.name=Gameplay diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties index 3d06be3..b5d791d 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/pl/beatrun.properties @@ -112,9 +112,6 @@ beatrun.toolsmenu.hud.hudxpdesc=Pokaż całkowitą liczbę PD w pobliżu swojego beatrun.toolsmenu.hud.wind=Efekt wiatru beatrun.toolsmenu.hud.winddesc=Włącza dźwięki wiatru w trakcie biegu -beatrun.toolsmenu.hud.fov=Pole widzenia -beatrun.toolsmenu.hud.fovdesc=Zmienia pole widzenia - beatrun.toolsmenu.hud.hidden=Ukryj interfejs beatrun.toolsmenu.hud.hiddendesc=0 - Pokazany\n1 - Tylko poza rozgrywką swobodną\n2 - Ukryty @@ -122,13 +119,15 @@ beatrun.toolsmenu.hud.textcolor=Kolor tekstu interfejsu beatrun.toolsmenu.hud.cornercolor=Kolor rogu interfejsu beatrun.toolsmenu.hud.floatxpcolor=Kolor "unoszących się" punktów PD na interfejsie -# Tools Menu Viewbob Section -beatrun.toolsmenu.viewbob.name=Kołysanie kamery w ruchu -beatrun.toolsmenu.viewbob.desc=Ustawienia kołysania kamery w ruchu +# Tools Menu Camera Section +beatrun.toolsmenu.camera.name=Kołysanie kamery w ruchu +beatrun.toolsmenu.camera.desc=Ustawienia kołysania kamery w ruchu -beatrun.toolsmenu.viewbob.stabilization=Stabilizacja kołysania kamery w ruchu -beatrun.toolsmenu.viewbob.stabilizationdesc=Włącz, aby zmniejszyć chorobę lokomocyjną za pomocą utrzymywania stabilności kamery w ruchu -beatrun.toolsmenu.viewbob.intensity=Intensywność kołysania kamery w ruchu +beatrun.toolsmenu.camera.stabilization=Stabilizacja kołysania kamery w ruchu +beatrun.toolsmenu.camera.stabilizationdesc=Włącz, aby zmniejszyć chorobę lokomocyjną za pomocą utrzymywania stabilności kamery w ruchu +beatrun.toolsmenu.camera.intensity=Intensywność kołysania kamery w ruchu +beatrun.toolsmenu.camera.fov=Pole widzenia +beatrun.toolsmenu.camera.fovdesc=Zmienia pole widzenia # Tools Menu Gameplay Section beatrun.toolsmenu.gameplay.name=Rozgrywka diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties index 63a2601..8b7ce86 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/pt-BR/beatrun.properties @@ -112,9 +112,6 @@ beatrun.toolsmenu.hud.hudxpdesc=Mostrar XP total perto do seu nome beatrun.toolsmenu.hud.wind=Efeito do Vento beatrun.toolsmenu.hud.winddesc=Barulho de vento enquanto estiver correndo -beatrun.toolsmenu.hud.fov=FOV -beatrun.toolsmenu.hud.fovdesc=Você precisa respawnar para mudar o FOV! - beatrun.toolsmenu.hud.hidden=Esconder a HUD beatrun.toolsmenu.hud.hiddendesc=0 - Mostrado\n1 - Gamemode apenas\n2 - Escondido @@ -122,13 +119,15 @@ beatrun.toolsmenu.hud.textcolor=Cor de Texto da HUD beatrun.toolsmenu.hud.cornercolor=Color do Canto da HUD beatrun.toolsmenu.hud.floatxpcolor=Color do XP Flutuante -# Tools Menu Viewbob Section -beatrun.toolsmenu.viewbob.name=Viewbob -beatrun.toolsmenu.viewbob.desc=Configuraçoes do Viewbob +# Tools Menu Camera Section +beatrun.toolsmenu.camera.name=Viewbob +beatrun.toolsmenu.camera.desc=Configuraçoes do Viewbob -beatrun.toolsmenu.viewbob.stabilization=Estabilização do Viewbob -beatrun.toolsmenu.viewbob.stabilizationdesc=Ative para reduzir o enjôo por fazer o viewbobbing fazer a visão do Jogador parecer centralizada -beatrun.toolsmenu.viewbob.intensity=Intensidade do Viewbob +beatrun.toolsmenu.camera.stabilization=Estabilização do Viewbob +beatrun.toolsmenu.camera.stabilizationdesc=Ative para reduzir o enjôo por fazer o viewbobbing fazer a visão do Jogador parecer centralizada +beatrun.toolsmenu.camera.intensity=Intensidade do Viewbob +beatrun.toolsmenu.camera.fov=FOV +beatrun.toolsmenu.camera.fovdesc=Você precisa respawnar para mudar o FOV! # Tools Menu Gameplay Section beatrun.toolsmenu.gameplay.name=Gameplay diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties index 7c07d3d..8c25a2e 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties @@ -41,8 +41,9 @@ beatrun.convars.disablegrapple=Переключить крюк-кошку beatrun.convars.puristmode=Режим Purist это клиентский параметр который сильно снижает движение игрока в стороны будучи в воздухе, прямо как в оригинальное ME.\n0 = Нет ограничений\n1 = Снижает движение игрока в воздухе в стороны beatrun.convars.quickturnground=Переключить Quickturn будучи на земле beatrun.convars.quickturnhandsonly=Переключить Quickturn только с "Runner Hands" -beatrun.convars.showSpeedometer=Нечего сказать -beatrun.convars.totsugekiAudio=Включить голос "Totsugeki" +beatrun.convars.rollspeedloss=Переключить потерю скорости при перекате +beatrun.convars.showspeedometer=Переключить спидометр +beatrun.convars.totsugekiaudio=Переключить звуки Totsugeki # HUD beatrun.hud.course=Курс: %s @@ -111,15 +112,12 @@ beatrun.toolsmenu.hud.nametagsdesc=Показывает ники над игро beatrun.toolsmenu.hud.hudxp=Показать XP в HUD beatrun.toolsmenu.hud.hudxpdesc=Показывает весь XP в HUD -beatrun.toolsmenu.hud.showSpeedometer=Показывать скорость (спидометр) -beatrun.toolsmenu.hud.showSpeedometerDesc=Показывает спидометр на HUD (скрытие HUD не влияет на видимость) +beatrun.toolsmenu.hud.showspeedometer=Показать спидометр +beatrun.toolsmenu.hud.showspeedometerdesc=Показывает спидометр в HUD beatrun.toolsmenu.hud.wind=Эффект Ветра beatrun.toolsmenu.hud.winddesc=Шум ветра во время бега -beatrun.toolsmenu.hud.fov=Угол Обзора -beatrun.toolsmenu.hud.fovdesc=Изменяет ваш Угол Обзора - beatrun.toolsmenu.hud.hidden=Скрыть HUD beatrun.toolsmenu.hud.hiddendesc=0 - Показать\n1 - Только режим\n2 - Скрыть полностью @@ -127,13 +125,15 @@ beatrun.toolsmenu.hud.textcolor=Цвет Текста в HUD beatrun.toolsmenu.hud.cornercolor=Цвет Края в HUD beatrun.toolsmenu.hud.floatxpcolor=Цвет Всплывающего XP в HUD -# Tools Menu Viewbob Section -beatrun.toolsmenu.viewbob.name=Покачивание Камеры -beatrun.toolsmenu.viewbob.desc=Настройки покачивания камеры +# Tools Menu Camera Section +beatrun.toolsmenu.camera.name=Камера +beatrun.toolsmenu.camera.desc=Настройки камеры -beatrun.toolsmenu.viewbob.stabilization=Стабилизация Покачивания -beatrun.toolsmenu.viewbob.stabilizationdesc=Включите чтобы снизить покачивание камеры центрируя её -beatrun.toolsmenu.viewbob.intensity=Интенсивность Покачивания Камеры +beatrun.toolsmenu.camera.stabilization=Стабилизация Покачивания +beatrun.toolsmenu.camera.stabilizationdesc=Включите чтобы снизить покачивание камеры центрируя её +beatrun.toolsmenu.camera.intensity=Интенсивность Покачивания Камеры +beatrun.toolsmenu.camera.fov=Угол Обзора +beatrun.toolsmenu.camera.fovdesc=Изменяет ваш Угол Обзора # Tools Menu Gameplay Section beatrun.toolsmenu.gameplay.name=Геймплей @@ -151,8 +151,8 @@ beatrun.toolsmenu.gameplay.puristmodedesc=Режим Purist это клиент beatrun.toolsmenu.gameplay.disablegrapple=Отключить Крюк-Кошку beatrun.toolsmenu.gameplay.disablegrappledesc=Отключает использование крюка-кошки -beatrun.toolsmenu.gameplay.rollLoseSpeed=Потеря скорости при перекате -beatrun.toolsmenu.gameplay.rollLoseSpeedDesc=Будет ли игрок терять скорость при перекате или нет (как в ME:Catalyst) +beatrun.toolsmenu.gameplay.rollspeedloss=Потеря скорости при перекате +beatrun.toolsmenu.gameplay.rollspeedlossdesc=Переключает потерю скорости при перекате # Tools Menu Misc Section beatrun.toolsmenu.misc.name=Другое diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties index c8e28c5..1c7a2be 100644 --- a/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties +++ b/beatrun/gamemodes/beatrun/content/resource/localization/tr/beatrun.properties @@ -112,8 +112,6 @@ beatrun.toolsmenu.hud.hudxpdesc=Takma adın yanında toplam XP'yi göster beatrun.toolsmenu.hud.wind=Rüzgar Etkisi beatrun.toolsmenu.hud.winddesc=Koşarken rüzgar sesleri -beatrun.toolsmenu.hud.fov=Görüş Alanı -beatrun.toolsmenu.hud.fovdesc=Görüş Alanınızı değiştirdikten sonra yeniden canlanmanız gerekiyor! beatrun.toolsmenu.hud.hidden=Arayüzü gizle beatrun.toolsmenu.hud.hiddendesc=0 - Gösterilen\n1 - Yalnızca oyun\nmodu 2 - Gizli @@ -122,13 +120,15 @@ beatrun.toolsmenu.hud.textcolor=Arayüz Metin Rengi beatrun.toolsmenu.hud.cornercolor=Arayüz Köşe Rengi beatrun.toolsmenu.hud.floatxpcolor=Arayüz Süzülen XP Rengi -# Tools Menu Viewbob Section -beatrun.toolsmenu.viewbob.name=Görüntü Sarsılması -beatrun.toolsmenu.viewbob.desc=Görüntü Sarsılma Ayarları +# Tools Menu Camera Section +beatrun.toolsmenu.camera.name=Görüntü Sarsılması +beatrun.toolsmenu.camera.desc=Görüntü Sarsılma Ayarları -beatrun.toolsmenu.viewbob.stabilization=Görüntü Sarsılma Stabilizasyonu -beatrun.toolsmenu.viewbob.stabilizationdesc=Görüntü sallamayı oyuncunun görünüm pozisyonunu ortalanmış halde tutarak yol tutmasını azaltmak için açın -beatrun.toolsmenu.viewbob.intensity=Sarsılma Şiddeti +beatrun.toolsmenu.camera.stabilization=Görüntü Sarsılma Stabilizasyonu +beatrun.toolsmenu.camera.stabilizationdesc=Görüntü sallamayı oyuncunun görünüm pozisyonunu ortalanmış halde tutarak yol tutmasını azaltmak için açın +beatrun.toolsmenu.camera.intensity=Sarsılma Şiddeti +beatrun.toolsmenu.camera.fov=Görüş Alanı +beatrun.toolsmenu.camera.fovdesc=Görüş Alanınızı değiştirdikten sonra yeniden canlanmanız gerekiyor! # Tools Menu Gameplay Section beatrun.toolsmenu.gameplay.name=Oynanış diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua b/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua index 45eb36e..dddc96f 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua @@ -166,8 +166,8 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function() panel:CheckBox("#beatrun.toolsmenu.hud.hudxp", "Beatrun_HUDXP") panel:ControlHelp("#beatrun.toolsmenu.hud.hudxpdesc") - panel:CheckBox("#beatrun.toolsmenu.hud.showSpeedometer", "Beatrun_ShowSpeedometer") - panel:ControlHelp("#beatrun.toolsmenu.hud.showSpeedometerDesc") + panel:CheckBox("#beatrun.toolsmenu.hud.showspeedometer", "Beatrun_ShowSpeedometer") + panel:ControlHelp("#beatrun.toolsmenu.hud.showspeedometerdesc") panel:CheckBox("#beatrun.toolsmenu.hud.wind", "Beatrun_Wind") panel:ControlHelp("#beatrun.toolsmenu.hud.winddesc") @@ -224,8 +224,8 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function() panel:NumSlider("#beatrun.toolsmenu.viewbob.intensity", "Beatrun_ViewbobIntensity", -100, 100, 0) - panel:NumSlider("#beatrun.toolsmenu.hud.fov", "Beatrun_FOV", 90, 120, 0) - panel:Help("#beatrun.toolsmenu.hud.fovdesc") + panel:NumSlider("#beatrun.toolsmenu.camera.fov", "Beatrun_FOV", 90, 120, 0) + panel:Help("#beatrun.toolsmenu.camera.fovdesc") end) spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_gameplay", "#beatrun.toolsmenu.gameplay.name", "", "", function(panel) @@ -244,9 +244,9 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function() panel:CheckBox("#beatrun.toolsmenu.gameplay.disablegrapple", "Beatrun_DisableGrapple") panel:ControlHelp("#beatrun.toolsmenu.gameplay.disablegrappledesc") - panel:CheckBox("#beatrun.toolsmenu.gameplay.rollLoseSpeed", "Beatrun_LoseSpeedOnRoll") - panel:ControlHelp("#beatrun.toolsmenu.gameplay.rollLoseSpeedDesc") - + panel:CheckBox("#beatrun.toolsmenu.gameplay.rollspeedloss", "Beatrun_RollSpeedLoss") + panel:ControlHelp("#beatrun.toolsmenu.gameplay.rollspeedlossdesc") + panel:CheckBox("#beatrun.toolsmenu.moves.totsugekiaudio", "Beatrun_TotsugekiAudio") panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.totsugekiaudiodesc")) end) diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua index 30fb0ca..c9165b1 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua @@ -18,7 +18,7 @@ local timealpha = 1000 local timecolor = color_neutral if CLIENT then - local showSpeed = CreateClientConVar("Beatrun_ShowSpeedometer", 1, true, true, language.GetPhrase("#beatrun.convars.showSpeedometer"), 0, 1) + CreateClientConVar("Beatrun_ShowSpeedometer", 1, true, true, language.GetPhrase("#beatrun.convars.showspeedometer"), 0, 1) end if SERVER then diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/CrouchJump.lua b/beatrun/gamemodes/beatrun/gamemode/sh/CrouchJump.lua index 12998ab..f20b066 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/CrouchJump.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/CrouchJump.lua @@ -8,9 +8,7 @@ elseif CLIENT and game.SinglePlayer() then net.Receive("CrouchJumpSP", function() local ply = LocalPlayer() - if ply:GetMoveType() == MOVETYPE_NOCLIP then - return - end + if ply:GetMoveType() == MOVETYPE_NOCLIP then return end if BodyAnimArmCopy then BodyAnimCycle = 0 @@ -33,9 +31,7 @@ hook.Add("SetupMove", "CrouchJump", function(ply, mv, cmd) ply:SetCrouchJumpBlocked(false) end - if ply:GetMoveType() == MOVETYPE_NOCLIP then - return - end + if ply:GetMoveType() == MOVETYPE_NOCLIP then return end local activewep = ply:GetActiveWeapon() diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Dive.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Dive.lua index 6dc0f61..98701f0 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Dive.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Dive.lua @@ -4,9 +4,9 @@ local totsugekiheading = CreateConVar("Beatrun_TotsugekiHeading", 0, {FCVAR_REPL local totsugekidir = CreateConVar("Beatrun_TotsugekiDir", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 0, 1) if CLIENT then - local tutsugekiAudio = CreateClientConVar("Beatrun_TotsugekiAudio", 1, true, true, language.GetPhrase("beatrun.convars.totsugekiAudio"), 0, 1) + CreateClientConVar("Beatrun_TotsugekiAudio", 1, true, true, language.GetPhrase("beatrun.convars.totsugekiaudio"), 0, 1) end - + local function Dive(ply, mv, cmd) if (not ply:GetDive() or ply:GetDive() and ply.QuakeJumping and totsugeki:GetBool() and totsugekispam:GetBool()) and ply:GetCrouchJump() and mv:KeyPressed(IN_ATTACK2) then local vel = mv:GetVelocity() @@ -35,7 +35,7 @@ local function Dive(ply, mv, cmd) if SERVER then if GetConVar("Beatrun_TotsugekiAudio"):GetBool() then ply:EmitSound("misc/totsugeki" .. math.random(1, 2) .. ".mp3", 60, 100, 1, CHAN_VOICE) - end + end local vPoint = mv:GetOrigin() local effectdata = EffectData() diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua index 9279c3f..eefbe6a 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua @@ -6,7 +6,7 @@ local landang = Angle(0, 0, 0) local lastGroundSpeed = 0 if CLIENT then - local loseSpeed = CreateClientConVar("Beatrun_LoseSpeedOnRoll", 1, true, true, language.GetPhrase("beatrun.convars.loseSpeedOnRoll"), 0, 1) + CreateClientConVar("Beatrun_RollSpeedLoss", 1, true, true, language.GetPhrase("beatrun.convars.rollspeedloss"), 0, 1) end local function SafetyRollThink(ply, mv, cmd) @@ -17,18 +17,24 @@ local function SafetyRollThink(ply, mv, cmd) mv:SetButtons(bit.band(mv:GetButtons(), bit.bnot(IN_DUCK))) end - + local isRolling = CurTime() < ply:GetSafetyRollKeyTime() if ply:OnGround() and not isRolling then lastGroundSpeed = mv:GetVelocity():Length() end + local isRolling = CurTime() < ply:GetSafetyRollKeyTime() + + if ply:OnGround() and not isRolling then + lastGroundSpeed = mv:GetVelocity():Length() + end + if CurTime() < ply:GetSafetyRollTime() then ply.FootstepLand = false local ang = ply:GetSafetyRollAng() - mv:SetSideSpeed(0) + mv:SetSideSpeed(0) mv:SetForwardSpeed(0) mv:AddKey(IN_DUCK) @@ -38,14 +44,14 @@ local function SafetyRollThink(ply, mv, cmd) vel.x = 0 vel.y = 0 - local con = GetConVar("Beatrun_LoseSpeedOnRoll") - local speedLimit = GetConVar("Beatrun_SpeedLimit"):GetFloat() + local speedloss = GetConVar("Beatrun_RollSpeedLoss"):GetBool() + local speedLimit = GetConVar("Beatrun_SpeedLimit"):GetInt() - if (con:GetBool()) then + if speedloss then mv:SetVelocity(ang:Forward() * 250 + vel) else local max = math.max(250, math.Clamp(lastGroundSpeed, 200, speedLimit + 50)) - mv:SetVelocity(ang:Forward() * (max + 40)) + mv:SetVelocity(ang:Forward() * (max + 40)) end ply:SetMEMoveLimit(450) @@ -111,7 +117,7 @@ hook.Add("SetupMove", "EvadeRoll", function(ply, mv, cmd) ang.x = 0 ang.z = 0 - ang:RotateAroundAxis(Vector(0, 0, 1), 180) + ang:RotateAroundAxis(Vector(0, 0, 1), 180) ply:SetJumpTurn(false) ply:SetSafetyRollAng(ang) ply:SetSafetyRollTime(CurTime() + 0.9) diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua index 6b77f72..b55bab0 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Sliding.lua @@ -520,8 +520,8 @@ hook.Add("SetupMove", "qslide", function(ply, mv, cmd) if not slippery and pos.z > ply:GetSlidingLastPos().z + 1 then ply:SetSlidingTime(ply:GetSlidingTime() - 0.025) elseif slippery or slidedelta < 1 and pos.z < ply:GetSlidingLastPos().z - 0.25 then - ply:SetSlidingTime(CT + slidetime) - ply:SetSlidingVel(math.min(mv:GetVelocity():Length() * 0.865, 450 * ply:GetOverdriveMult()) * ply:GetOverdriveMult()) + ply:SetSlidingTime(CT + slidetime) --[[ 450 * ply:GetOverdriveMult() ]] + ply:SetSlidingVel(math.min(mv:GetVelocity():Length() * 0.865, GetConVar("Beatrun_SpeedLimit"):GetInt() * 2) * ply:GetOverdriveMult()) end ply:SetSlidingLastPos(pos)