Merge branch 'JonnyBro:main' into master

BeatrunAnimInstaller_Source/README.md

@@ -0,0 +1,29 @@
+# ENGLISH
+
+# Animations Installer Source Code
+
+Here you can find source code of the animations installer.\
+I don't know why you will ever need that but we put it here so you can be sure we don't supply malware with our fork.
+
+## How To Use
+
+Please refer to this [README](../beatrun/README.md).
+
+## Credits
+
+* [YuRaNnNzZZ](https://github.com/YuRaNnNzZZ) - Creator of this installer.
+
+# RUSSIAN
+
+# Исходный код установщика анимаций
+
+Здесь находятся исходники нашего установщика анимаций.\
+Я не знаю зачем это вам, но мы оставили их здесь чтобы вы могли убедиться что мы не распространяем вирусы в нашем форке.
+
+## Как использовать
+
+Прочитайте этот файл [README](../beatrun/README.md).
+
+## Благодарность
+
+* [YuRaNnNzZZ](https://github.com/YuRaNnNzZZ) - Создатель установщика.

README.md

@@ -1,75 +1,95 @@
-# Beatrun | Community version
+# Beatrun | Community edition
 
-Infamous parkour addon for Garry's Mod, fully open sourced and maintained by the community.
+* [Русский](./README_ru.md)
 
-This version does not include malicious modules, code or networking. What it does contain is:
+Infamous parkour addon for Garry's Mod, fully open sourced and maintained by the community (me 😞).
-* Lua modules for Discord Rich Presence
-* Lua modules for Steam Presence
-* Network connectivity for courses (activates only when you load or upload courses, and by default `courses.beatrun.ru` is used)
 
-**All of this is optional and you may remove all of it. (modules are located [here](https://github.com/JonnyBro/beatrun/blob/master/lua/bin/) and online courses functionality is [here](https://github.com/JonnyBro/beatrun/blob/master/beatrun/gamemodes/beatrun/gamemode/cl/OnlineCourse.lua))**
+> [!IMPORTANT]
+> You will not find here any malicious modules, code or networking! We have modules and networking for:
+>
+> * Discord Rich Presence.
+> * Steam Presence.
+> * Custom Courses Database.
+>
+> **All of this is optional and you can remove all of it.**\
+> Modules are located [here](https://github.com/JonnyBro/beatrun/tree/main/lua/bin) and courses database functionality is [here](https://github.com/JonnyBro/beatrun/blob/main/beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua).\
+> You can find source code for modules in [Credits](#credits) section.
 
-# Installation (Manual)
+**PLEASE READ EVERYTHING BEFORE ASKING QUESTIONS ON OUR SERVER!**
-1. Download this repository [here](https://github.com/JonnyBro/beatrun/archive/refs/heads/master.zip).
+
-2. Delete the `beatrun` folder in *addons* if you have one!
+## Automatic Installation (Recommended | Windows only)
-3. Extract the `beatrun` folder to *your_game_folder/garrysmod/addons*.
+
-4. Extract the `lua` folder to *your_game_folder/garrysmod*.
+Run the command below in Powershell.
-	* `lua` folder contains modules for Discord Rich Presense and Steam Presence. They are optional. You can find their source code in the [credits](https://github.com/JonnyBro/beatrun?tab=readme-ov-file#credits-3) section<br><br>
+> [!NOTE]
+> Win + R > `powershell`
 
-# Installation (Automatic | Windows only)
-Run the command below in the Powershell. (Win + R --> powershell --> the command below)
 ```powershell
-iex (iwr "beatrun.ru/install.ps1" -UseBasicParsing)
+iex (iwr "rlxx.ru/beatrun" -UseBasicParsing)
 ```
 
+## Manual Installation
+
+1. Download this repository [here](https://github.com/JonnyBro/beatrun/archive/refs/heads/master.zip).
+2. **Delete the `beatrun` folder in *your_game_folder/garrysmod/addons* if you have one.**
+3. Extract the `beatrun-main/beatrun` folder to *your_game_folder/garrysmod/addons*.
+4. Extract the `beatrun-main/lua` folder to *your_game_folder/garrysmod*.
+
 ## Animations
-You can use "**Beatrun Animations Installer**" for custom animations. Currently there's:
-* Beatrun Reanimated
-* Fixed Original<br><br>
 
-Start the executable and press a key on your keyboard with the number of the animation you want to install (if nothing's changed, run the program as admin).<br>
+Please refer to this [README](beatrun/README.md).
-Installer's source can be found [here](/BeatrunAnimInstaller).
 
-## Changes and fixes done by me
+## Changes
-* Created a [custom online courses database](https://courses.beatrun.ru), which is also free and [open source](https://github.com/relaxtakenotes/beatrun-courses-server/) 🤯!
+
-* Added a new gamemode - *Deathmatch*, it's like Data Theft, but you collect kills not cubes!
+> [!IMPORTANT]
-* Added an in-game config menu - You can find it in the tool menu, in the *Beatrun* Category!\
+> There are many undocumented changes and fixes in this version, you better look at the commits for more specific changes.
-All of the settings below can be changed in the configuration menu.
+
-* Added the ability Getting off of ladders.
+* Jonny_Bro is hosting [custom online courses database](https://courses.beatrun.ru), which is also free and [open source](https://github.com/relaxtakenotes/beatrun-courses-server/) 🤯!
-* Allowed jumping while slowwalking.
+* Implemented a new gamemode - **Deathmatch** (it's way more fun than Data Theft I promise).
-* Done various tweaks to the Time Trials Menu (F4).
+* Implemented "Proper" Kick Glitch just like in [original ME](https://www.youtube.com/watch?v=zK5y3NBUStc).
+* Added an in-game config menu - you can find it in the tool menu, in the *Beatrun* Category.\
+**All** of the Beatrun settings can be changed in the configuration menu.
+* Localization support.\
+For now Russian and English are supported.
+* Added the ability to get off of ladders.
 * Added an arrow that shows the next checkpoint.
-* Added a convar to allow Overdrive usage on the server - `Beatrun_AllowOverdriveInMultiplayer`.
+* Added a ConVar to allow Overdrive usage on the server - `Beatrun_AllowOverdriveInMultiplayer`.
-* Added a convar to toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`.
+* Added a ConVar to toggle between old and new Kick Glitch - `Beatrun_OldKickGlitch`.
-* Added convars to change HUD's colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`.
+* Added some ConVars to change HUD colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`.
-* Added a convar to allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`.
+* Added a ConVar to allow players to spawn props and weapons without admin rights - `Beatrun_AllowPropSpawn`.
-* Added a convar to disable grapple ability - `Beatrun_DisableGrapple`.
+* Added a ConVar to disable grapple ability - `Beatrun_DisableGrapple`.
-* Implemented Discord Rich Presence using open source tools (See step 3).
+* Added a ConVar to allow QuickTurn with any weapon or only with *Runner Hands* - `Beatrun_QuickturnHandsOnly`.
 * Added small camera punch when diving.
-* Added the ability to remove ziplines that created with *Zipline Gun* - RMB.
+* Added the ability to remove ziplines that created with *Zipline Gun* - `RMB`.
-* SteamID in the right corner is no longer present.
+* Implemented Discord Rich Presence using [open source](#credits) module.
 
-## Notable changes and fixes done by the community
+## Fixes
-* Made QuickTurn work only with `Runner Hands`.
+
+* Your SteamID in the right corner is no longer present.
+* Fixed some playermodels show up as ERROR.
+* Done various tweaks to the Courses Menu (F4).
+* Allowed jumping while walking (🤷).
 * Fixed leaderboard sorting in gamemodes.
 * Fixed grapple usage in courses and gamemodes.
-* Fixed a crash in DataTheft when touching data bank.
+* Fixed a crash in Data Theft when touching Data Bank.
-* Fixed an error on course load.
+* Fixed an error on course loading.
-* Fixed collisions issues. (you getting stuck in walls for no reason or player to player damage not going through in gamemodes other than datatheft)
+* Fixed collisions issues. (PvP damage not going through in gamemodes other than Data Theft)
-* Added Proper Kick Glitch ([Like in original ME](https://www.youtube.com/watch?v=zK5y3NBUStc)). (cry about prediction errors l0l)
 * Tweaked safety roll, now you can roll under things.
+* Tweaked some grapple related stuff. Now it moves with the entity it was attached to and other players can see the rope.
 * Made it possible to dive to your death =).
-* Added some grapple related stuff. Now it moves with the entity it was attached to and other players can see the rope.
 
 ## TODO
-- [ ] Gamemodes menu.
 
-# Related
+* [ ] Loadouts creation menu for Data Theft and Deathmatch. (idk how to properly implement this for know).
-* [beatrun-anims](https://github.com/JonnyBro/beatrun-anims) - Decompiled beatrun animations.
 
-# Credits <3
+## Related
-* All contributors.
+
-* [MTB](https://www.youtube.com/@MTB396) - Beatrun Reanimated project.
+* [Beatrun Reanimated Project](https://github.com/JonnyBro/beatrun-anims).
+
+## Credits
+
+* [All contributors](https://github.com/JonnyBro/beatrun/graphs/contributors) - <3.
+* [EarthyKiller127](https://www.youtube.com/channel/UCiFqPwGo4x0J65xafIaECDQ) - He made that piece of shit.
+* [relaxtakenotes](https://github.com/relaxtakenotes) - Made all of this possible.
+* [MTB](https://www.youtube.com/@MTB396) - Beatrun Reanimated Project.
 * [Discord Rich Presence](https://github.com/fluffy-servers/gmod-discord-rpc) by Fluffy Servers.
 * [Steam Presence](https://github.com/YuRaNnNzZZ/gmcl_steamrichpresencer) by YuRaNnNzZZ.
-* [earthykiller](https://www.youtube.com/channel/UCiFqPwGo4x0J65xafIaECDQ) - He made that piece of shit code.

README_ru.md

@@ -0,0 +1,95 @@
+# Beatrun | Версия от сообщества
+
+* [English](./README.md)
+
+Печально известный паркур-аддон для Garry's Mod, с полностью открытым исходным кодом и поддерживаемый сообществом (мной 😞).
+
+> [!IMPORTANT]
+> У нас вы не найдёте вредоносного кода, модулей или сетевого кода! У нас есть модули и сетевой код, который используется для:
+>
+> * Discord Rich Presence.
+> * Steam Presence.
+> * Пользовательская онлайн база курсов.
+>
+> **Всё это необязательно и может быть удалено.**\
+> Модули находятся [тут](https://github.com/JonnyBro/beatrun/tree/main/lua/bin) и функционал онлайн базы курсов доступен [здесь](https://github.com/JonnyBro/beatrun/blob/main/beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua).\
+> Исходный код модулей можно найти в [благодарностях](#благодарности).
+
+**ПОЖАЛУЙСТА, ПРОЧТИТЕ ВЕСЬ ДОКУМЕНТ ПЕРЕД ТЕМ КАК ЗАДАВАТЬ ВОПРОСЫ НА НАШЕМ СЕРВЕРЕ!**
+
+## Автоматическая установка (Рекомендуемое | только для Windows)
+
+Запустите команду ниже в Powershell.
+> [!NOTE]
+> Win + R > `powershell`
+
+```powershell
+iex (iwr "rlxx.ru/beatrun" -UseBasicParsing)
+```
+
+## Ручная установка
+
+1. Скачайте данный репозиторий по данной [ссылке](https://github.com/JonnyBro/beatrun/archive/refs/heads/master.zip).
+2. **Удалите старую папку `beatrun` по пути *путь_к_игре/garrysmod/addons* если она у вас имеется.**
+3. Извлеките папку `beatrun-main/beatrun` по пути *путь_к_игре/garrysmod/addons*.
+4. Извлеките папку `beatrun-main/lua` по пути *путь_к_игре/garrysmod*.
+
+## Анимации
+
+Пожалуйста, обратитесь к данному [README](beatrun/README.md).
+
+## Изменения
+
+> [!IMPORTANT]
+> Множество изменений и исправлений не задокументированы, обратитесь к списку коммитов для более подробного списка изменений.
+
+* Jonny_Bro держит [пользовательскую онлайн базу курсов](https://courses.beatrun.ru), которая так же бесплатна и имеет [открытый исходный код](https://github.com/relaxtakenotes/beatrun-courses-server/) 🤯!
+* Реализован новый режим - **Deathmatch** (намного веселее чем Data Theft, честно).
+* Реализован "правильный" Kick Glitch прямо как в [оригинальной ME](https://www.youtube.com/watch?v=zK5y3NBUStc).
+* Добавлено меню настроек в игре - его можно найти в списке инструментов, в категории *Beatrun*.\
+Вам доступны **все** настройки Beatrun из данного меню.
+* Поддержка локализации.\
+На данный момент доступны Русский и Английский языки.
+* Добавлена возможность слезания с лестниц.
+* Добавлена стрелка указывающая на следующую контрольную точку.
+* Добавлена переменная которая разрешает использование Overdrive на сервере - `Beatrun_AllowOverdriveInMultiplayer`.
+* Добавлена переменная которая позволяет переключится между старым и новым Kick Glitch - `Beatrun_OldKickGlitch`.
+* Добавлено несколько переменных позволяющих настроить цвета HUD - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`.
+* Добавлена переменная которая разрешает игрокам без админ прав создавать пропы и оружие - `Beatrun_AllowPropSpawn`.
+* Добавлена переменная которая позволяет переключить работу крюка-кошки - `Beatrun_DisableGrapple`.
+* Добавлена переменная которая позволяет переключить использование Quickturn только с *Runner Hands* или с любым оружием - `Beatrun_QuickturnHandsOnly`.
+* Добавлен небольшой толчёк камеры при нырянии.
+* Добавлена возможность удаления зиплайнов созданных *Zipline Gun* - `ПКМ`.
+* Реализована поддержка Discord Rich Presence используя модуль с [открытым исходным кодом](#благодарности).
+
+## Исправления
+
+* Ваш SteamID больше не показывается в углу экрана.
+* Исправлено отображение некоторых моделей игрока как ERROR.
+* Сделано несколько изменений в меню выбора курсов (F4).
+* Разрешены прыжки во время ходьбы (🤷).
+* Исправлена сортировка в таблице лидеров.
+* Исправлено использование крюка-кошки в режимах и курсах.
+* Исправлен краш при соприкосновении с Data Bank в Data Theft.
+* Исправлена ошибка загрузки курсов.
+* Исправлены ошибки коллизий. (PvP урон не проходил нигде, кроме Data Theft)
+* Изменён кувырок, теперь можно кувыркаться под объектами.
+* Изменена крюк-кошка. Теперь вы движетесь вместе с объектом к которому она прицеплена и её видят другие игроки.
+* Теперь можно нырнуть до смерти =).
+
+## TODO
+
+* [ ] Меню выбора снаряжения для Data Theft и Deathmatch (не знаю пока как это реализовать).
+
+## Может быть полезно
+
+* [Beatrun Reanimated Project](https://github.com/JonnyBro/beatrun-anims).
+
+## Благодарности
+
+* [Все участники](https://github.com/JonnyBro/beatrun/graphs/contributors) - <3.
+* [EarthyKiller127](https://www.youtube.com/channel/UCiFqPwGo4x0J65xafIaECDQ) - Создатель этого куска дерьма.
+* [relaxtakenotes](https://github.com/relaxtakenotes) - Если бы не он, этого проекта бы не существовало.
+* [MTB](https://www.youtube.com/@MTB396) - Создатель Beatrun Reanimated Project.
+* [Discord Rich Presence](https://github.com/fluffy-servers/gmod-discord-rpc) от Fluffy Servers.
+* [Steam Presence](https://github.com/YuRaNnNzZZ/gmcl_steamrichpresencer) от YuRaNnNzZZ.

beatrun/README.md

@@ -0,0 +1,39 @@
+# ENGLISH
+
+# Animations Installer
+
+You can use **BeatrunAnimInstaller** (located literally here) to change animations. Currently we have:
+
+1. `Beatrun Reanimated Project` animations.
+2. Original but fixed animations.
+
+## How To Use
+
+1. Start the executable.
+2. Press a key on your keyboard with the number of the animation you want to install.
+> [!NOTE]
+> If nothing is changed, close the game and/or try run the program with admin priveleges.
+
+## Source Code
+
+Please refer to this [README](../BeatrunAnimInstaller_Source/README.md).
+
+# RUSSIAN
+
+# Установщик анимаций
+
+Используйте **BeatrunAnimInstaller** (который расположен прямо тут) чтобы менять анимации. На данный момент у нас имеются:
+
+1. Анимации из `Beatrun Reanimated Project`.
+2. Оригинальные анимации с правками и фиксами.
+
+## Как использовать
+
+1. Запустите исполняемый файл.
+2. Нажмите цифру желаемых анимаций на клавиатуре.
+> [!NOTE]
+> Если ничего не изменилось, закройте игру и/или запустите файл от имени администратора.
+
+## Исходный код
+
+Прочитайте этот файл [README](../BeatrunAnimInstaller_Source/README.md).

beatrun/gamemodes/beatrun/beatrun.txt

@@ -3,5 +3,6 @@
 	"base"		"base"
 	"title"		"Beatrun"
 	"maps"		"^br_"
+	"category"	"other"
 	"menusystem"	"1"
 }

beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties

@@ -0,0 +1,238 @@
+# Misc
+beatrun.misc.ok=OK
+beatrun.misc.noclipdetected=Noclip Detected! Respawn to restart the course
+beatrun.misc.checkconsole=Check console!
+
+# AddonWarning
+beatrun.addonwarning.warntext=NOTICE\nPlease disable the following addons before playing\nor submitting any issues to GitHub:
+beatrun.addonwarning.quitbutton=Quit to Main Menu
+beatrun.addonwarning.play=Play
+beatrun.addonwarning.conflictfound=CONFLICTING ADDONS FOUND
+
+# BuildModeHUD
+beatrun.buildmodehud.info=Index: %s\nSelected: %s\nAngle: %s
+beatrun.buildmodehud.props=Menu / Props
+beatrun.buildmodehud.entities=Menu / Entities
+beatrun.buildmodehud.drag=Drag (G)
+beatrun.buildmodehud.copy=Copy (SHIFT+D)
+beatrun.buildmodehud.delete=Delete (DEL/BCKSPC)
+beatrun.buildmodehud.highlight=Highlight (T)
+beatrun.buildmodehud.select=Select
+beatrun.buildmodehud.zipline=Zipline (SHIFT = 2-Way)
+
+# All ConVars
+beatrun.convars.hudxp=Show total XP near nickname
+beatrun.convars.hudsway=Display HUD swaying
+beatrun.convars.huddynamic=Hide HUD when moving
+beatrun.convars.hudhidden=Hides most of the HUD
+beatrun.convars.hudreticle=Display a reticle
+beatrun.convars.hudtextcolor=HUD Text Color\nDefault: 255 255 255 255
+beatrun.convars.hudcornercolor=HUD Corner Color\nDefault: 20 20 20 100
+beatrun.convars.hudfloatxpcolor=HUD Floating XP Color\nDefault: 255 255 255 255
+beatrun.convars.nametags=Display nametags above players
+beatrun.convars.apikey=API key
+beatrun.convars.domain=Domain of the courses database
+beatrun.convars.viewbob=Viewbob Intensity
+beatrun.convars.viewbobstabilization=Turn on to reduce motion sickness by making viewbobbing keep the player's look position centered
+beatrun.convars.fov=Changes player's Field Of View
+beatrun.convars.cpsave=Respawning during a course will go back to the last hit checkpoint
+beatrun.convars.faststart=Faster start countdown
+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
+
+# HUD
+beatrun.hud.course=Course: %s
+beatrun.hud.freeplay=Freeplay
+beatrun.hud.lvl=Lvl: %s
+beatrun.hud.infector=Infector
+
+# Menu_Course
+beatrun.coursemenu.trials=Courses - %s
+beatrun.coursemenu.buildmode=Toggle Build Mode
+beatrun.coursemenu.freeplay=Return to Freeplay
+
+# CoursesDatabase
+beatrun.coursesdatabase.cantuploadfreeplay=Can't upload in Freeplay
+beatrun.coursesdatabase.upload1=You're trying to upload a course with the name %s on map %s.
+beatrun.coursesdatabase.upload2=Use Beatrun_Confirm to continue or Beatrun_Cancel to cancel.
+beatrun.coursesdatabase.update1=You are trying to update a course with this code %s to course with name %s on map %s.
+
+# Tools Menu
+beatrun.toolsmenu.client=Client
+beatrun.toolsmenu.server=Server
+
+# Tools Menu Courses Section
+beatrun.toolsmenu.courses.name=Courses
+beatrun.toolsmenu.courses.desc=Courses Settings
+
+beatrun.toolsmenu.courses.faststart=Fast Start
+beatrun.toolsmenu.courses.faststartdesc=Faster countdown at the start of the course
+
+beatrun.toolsmenu.courses.checkpointsave=Save at Checkpoint
+beatrun.toolsmenu.courses.checkpointsavedesc=Respawn at last hit checkpoint in courses
+
+beatrun.toolsmenu.courses.database=Database Domain
+beatrun.toolsmenu.courses.databasedesc=Domain/IP of the database\nDefault: courses.beatrun.ru
+
+beatrun.toolsmenu.courses.changeapikey=Change API Key
+beatrun.toolsmenu.courses.enterapikey=Enter your API key
+
+beatrun.toolsmenu.courses.savecourse=Save Currently Running Course to a File
+beatrun.toolsmenu.courses.namesavecourse=Enter a name for your course
+
+beatrun.toolsmenu.courses.loadcourse=Load a Course from the Online Database
+beatrun.toolsmenu.courses.enterloadcourse=Enter course code
+
+beatrun.toolsmenu.courses.uploadcourse=Upload Currently Running Course to the Database
+
+beatrun.toolsmenu.courses.updatecourse=Update a Course on the Database
+beatrun.toolsmenu.courses.updatecoursehelp=Updates a course on the database with the currently running one
+
+# Tools Menu HUD Section
+beatrun.toolsmenu.hud.name=HUD
+beatrun.toolsmenu.hud.desc=HUD Settings
+
+beatrun.toolsmenu.hud.dynamic=Dynamic HUD
+beatrun.toolsmenu.hud.dynamicdesc=Hides HUD when moving
+
+beatrun.toolsmenu.hud.sway=HUD Sway
+beatrun.toolsmenu.hud.swaydesc=Toggles HUD swaying
+
+beatrun.toolsmenu.hud.reticle=Show Reticle
+beatrun.toolsmenu.hud.reticledesc=Shows a dot in the center of the screen
+
+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.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.hidden=Hide HUD
+beatrun.toolsmenu.hud.hiddendesc=0 - Shown\n1 - Gamemode only\n2 - Hidden
+
+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=Viewbob
+beatrun.toolsmenu.viewbob.desc=Viewbob 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
+
+# Tools Menu Gameplay Section
+beatrun.toolsmenu.gameplay.name=Gameplay
+beatrun.toolsmenu.gameplay.desc=Gameplay Settings
+
+beatrun.toolsmenu.gameplay.quickturnground=Quickturn Ground
+beatrun.toolsmenu.gameplay.quickturngrounddesc=Enables quickturning with secondary attack while on the ground
+
+beatrun.toolsmenu.gameplay.quickturnhandsonly=Quickturn Hands Only
+beatrun.toolsmenu.gameplay.quickturnhandsonlydesc=Enables quickturning with "Runner Hands" only
+
+beatrun.toolsmenu.gameplay.puristmode=Purist Mode
+beatrun.toolsmenu.gameplay.puristmodedesc=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.\nDisabled = No restrictions\nEnabled = Reduced move speed in the air
+
+beatrun.toolsmenu.gameplay.disablegrapple=Disable Grapple Ability
+beatrun.toolsmenu.gameplay.disablegrappledesc=Disables grapple ability
+
+# Tools Menu Misc Section
+beatrun.toolsmenu.misc.name=Misc
+beatrun.toolsmenu.misc.desc=Misc Settings
+
+beatrun.toolsmenu.misc.propspawn=Prop Spawning
+beatrun.toolsmenu.misc.propspawndesc=Allows players without admin rights to spawn props, entities and weapons
+
+beatrun.toolsmenu.misc.overdrivemp=Overdrive in Multiplayer
+beatrun.toolsmenu.misc.overdrivempdesc=Allows Overdrive usage on the server
+
+# Tools Menu Moves Section
+beatrun.toolsmenu.moves.name=Moves
+beatrun.toolsmenu.moves.desc=Moves Settings
+beatrun.toolsmenu.moves.help=You Can Dive with Ctrl + RMB While Midair!\nOverdrive Toggles with E + LMB.
+
+beatrun.toolsmenu.moves.speedlimit=Speed Limit
+beatrun.toolsmenu.moves.speedlimitdesc=Changes player's speed limit\nDefault: 325
+
+beatrun.toolsmenu.moves.forcepuristmode=Force Purist Mode
+beatrun.toolsmenu.moves.forcepuristmodedesc=Forces Purist Mode to be enabled for all players
+
+beatrun.toolsmenu.moves.realisticwallrunning="Realistic" wallrunning
+beatrun.toolsmenu.moves.realisticwallrunningdesc=You don't lose speed when starting wallrunning when disabled
+
+beatrun.toolsmenu.moves.kickglitch=Kick Glitch
+beatrun.toolsmenu.moves.kickglitchdesc=Toggles Kick Glitch Move\nLMB when Wallrunning and Then Jumping Right After
+
+beatrun.toolsmenu.moves.kickglitchversion=Kick Glitch Version
+beatrun.toolsmenu.moves.kickglitchversiondesc=Enabled - Old version\nDisabled - New version\nNew version uses mechanic from ME that spawns a small platform under a player
+
+beatrun.toolsmenu.moves.quakejump=Quake Jump
+beatrun.toolsmenu.moves.quakejumpdesc=Toggles Quake Jump Move\nPress Jump Right After Side Step
+
+beatrun.toolsmenu.moves.sidestep=Side Step
+beatrun.toolsmenu.moves.sidestepdesc=Toggles Side Step Move\nA/D + RMB
+
+beatrun.toolsmenu.moves.disarm=Disarm
+beatrun.toolsmenu.moves.disarmdesc=Toggles Ability to Disarm NPC\nPress USE on an NPC
+
+beatrun.toolsmenu.moves.divesettings=Dive Settings
+
+beatrun.toolsmenu.moves.totsugeki=Totsugeki
+beatrun.toolsmenu.moves.totsugekidesc=Toggles Totsugeki Move\nDive Right After Quake Jump
+
+beatrun.toolsmenu.moves.totsugekispam=Totsugeki Spam
+beatrun.toolsmenu.moves.totsugekispamdesc=Toggles Ability to Spam Totsugeki
+
+beatrun.toolsmenu.moves.totsugekiheading=Totsugeki Heading
+beatrun.toolsmenu.moves.totsugekiheadingdesc=Allows to Totsugeki on X axis (up/down)
+
+beatrun.toolsmenu.moves.totsugekidirection=Totsugeki Direction
+beatrun.toolsmenu.moves.totsugekidirectiondesc=Allows to Totsugeki into Another Direction\nCombined with Spam and Heading Allows You to Fly =)
+
+# Tools Menu Gamemodes Section
+beatrun.toolsmenu.gamemodes.name=Gamemodes
+beatrun.toolsmenu.gamemodes.desc=Gamemodes Settings
+beatrun.toolsmenu.gamemodes.error=Another gamemode is running!
+
+beatrun.toolsmenu.gamemodes.infection=Toggle Infection Gamemode
+beatrun.toolsmenu.gamemodes.infectionstarttime=Time before starting
+beatrun.toolsmenu.gamemodes.infectiongametime=Length of the game
+beatrun.toolsmenu.gamemodes.infectiontime=Time in seconds
+beatrun.toolsmenu.gamemodes.datatheft=Toggle Data Theft Gamemode
+beatrun.toolsmenu.gamemodes.deathmatch=Toggle Deathmatch Gamemode
+
+# Checkpoints
+beatrun.checkpoints.countdown1=Ready
+beatrun.checkpoints.countdown2=Set
+beatrun.checkpoints.countdown3=GO!
+beatrun.checkpoints.speedometer=%s km/h
+
+# DataTheft
+beatrun.datatheft.name=Data Theft (%s)
+beatrun.datatheft.start=Data Theft! Kill players to collect data, deposit data in banks
+
+# Deathmatch
+beatrun.deathmatch.name=Deathmatch
+beatrun.deathmatch.start=Deathmatch! Kill players to get points!
+
+# Infection
+beatrun.infection.name=Infection
+beatrun.infection.infectedtext=(Infected)
+beatrun.infection.humantext=(Human)
+beatrun.infection.start=Infection! Touch other players to infect them\n%s player(s) will become infected in %ss
+beatrun.infection.nosurvivors=None...
+beatrun.infection.infected=was infected!
+beatrun.infection.infectedby=has infected
+beatrun.infection.award=You were awarded 200 XP for surviving!
+beatrun.infection.awardinfected=You were awarded 100 XP for spawning as an infected!
+beatrun.infection.end=The game has ended!\nSurvivors: %s\nRestarting in 15s

beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties

@@ -0,0 +1,238 @@
+# Misc
+beatrun.misc.ok=Ок
+beatrun.misc.noclipdetected=Обнаружен NoClip! Нажмите R чтобы начать заного
+beatrun.misc.checkconsole=Проверьте консоль!
+
+# AddonWarning
+beatrun.addonwarning.warntext=ВНИМАНИЕ\nПожалуйста, отключите данные аддоны перед игрой\nили созданием сообщений на GitHub:
+beatrun.addonwarning.quitbutton=Выйти в меню
+beatrun.addonwarning.play=Играть
+beatrun.addonwarning.conflictfound=НЕСОВМЕСТИМЫЕ АДДОНЫ ОБНАРУЖЕНЫ
+
+# BuildModeHUD
+beatrun.buildmodehud.info=Указатель: %s\nВыбрано: %s\nУгол: %s
+beatrun.buildmodehud.props=Меню / Пропы
+beatrun.buildmodehud.entities=Меню / Энтити
+beatrun.buildmodehud.drag=Переместить (G)
+beatrun.buildmodehud.copy=Копировать (SHIFT+D)
+beatrun.buildmodehud.delete=Удалить (DEL/BCKSPC)
+beatrun.buildmodehud.highlight=Подсветить (T)
+beatrun.buildmodehud.select=Выбрать
+beatrun.buildmodehud.zipline=Зиплайн (SHIFT = двухсторонний)
+
+# All ConVars
+beatrun.convars.hudxp=Показать весь опыт рядом с ником
+beatrun.convars.hudsway=Отображать покачивание HUD
+beatrun.convars.huddynamic=Скрыть HUD при движении
+beatrun.convars.hudhidden=Скрыть HUD
+beatrun.convars.hudreticle=Показать точку
+beatrun.convars.hudtextcolor=Цвет текста в HUD\nDefault: 255 255 255 255
+beatrun.convars.hudcornercolor=Цвет края в HUD\nDefault: 20 20 20 100
+beatrun.convars.hudfloatxpcolor=Цвет всплывающего XP в HUD\nDefault: 255 255 255 255
+beatrun.convars.nametags=Показать ники над игроками
+beatrun.convars.apikey=API ключ
+beatrun.convars.domain=Домен онлайн базы курсов
+beatrun.convars.viewbob=Интенсивность покачивания камеры
+beatrun.convars.viewbobstabilization=Включите чтобы снизить покачивание камеры центрируя её
+beatrun.convars.fov=Угол обзора игрока
+beatrun.convars.cpsave=Респавн в курсах отправляет на последнюю контрольную точку
+beatrun.convars.faststart=Быстрый отчёт в начале курса
+beatrun.convars.disablegrapple=Переключить крюк-кошку
+beatrun.convars.puristmode=Режим Purist это клиентский параметр который сильно снижает движение игрока в стороны будучи в воздухе, прямо как в оригинальное ME.\n0 = Нет ограничений\n1 = Снижает движение игрока в воздухе в стороны
+beatrun.convars.quickturnground=Переключить Quickturn будучи на земле
+beatrun.convars.quickturnhandsonly=Переключить Quickturn только с "Runner Hands"
+
+# HUD
+beatrun.hud.course=Курс: %s
+beatrun.hud.freeplay=Свободная игра
+beatrun.hud.lvl=Лвл: %s
+beatrun.hud.infector=Заражённый
+
+# Menu_Course
+beatrun.coursemenu.trials=Курсы - %s
+beatrun.coursemenu.buildmode=Режим строительства
+beatrun.coursemenu.freeplay=Свободная игра
+
+# CoursesDatabase
+beatrun.coursesdatabase.cantuploadfreeplay=Нельзя загружать во время свободной игры
+beatrun.coursesdatabase.upload1=Вы пытаетесь загрузить курс с названием %s на карте %s.
+beatrun.coursesdatabase.upload2=Используйте Beatrun_Confirm чтобы продолжить или Beatrun_Cancel чтобы отменить.
+beatrun.coursesdatabase.update1=Вы пытаетесь обновить курс с кодом %s на курс с названием %s на карте %s.
+
+# Tools Menu
+beatrun.toolsmenu.client=Клиент
+beatrun.toolsmenu.server=Сервер
+
+# Tools Menu Courses Section
+beatrun.toolsmenu.courses.name=Курсы
+beatrun.toolsmenu.courses.desc=Настройки курсов
+
+beatrun.toolsmenu.courses.faststart=Быстрый старт
+beatrun.toolsmenu.courses.faststartdesc=Быстрый отчёт в начале курса
+
+beatrun.toolsmenu.courses.checkpointsave=Сохранение на Контр. точках
+beatrun.toolsmenu.courses.checkpointsavedesc=Респавн на последней контрольной точке
+
+beatrun.toolsmenu.courses.database=Домен Базы
+beatrun.toolsmenu.courses.databasedesc=Домен/IP онлайн базы курсов\nПо умолчанию: courses.beatrun.ru
+
+beatrun.toolsmenu.courses.changeapikey=Изменить API Ключ
+beatrun.toolsmenu.courses.enterapikey=Введите ваш API ключ
+
+beatrun.toolsmenu.courses.savecourse=Сохранить Текущий Курс в Файл
+beatrun.toolsmenu.courses.namesavecourse=Введите название для курса
+
+beatrun.toolsmenu.courses.loadcourse=Загрузить Курс из Базы
+beatrun.toolsmenu.courses.enterloadcourse=Введите код курса
+
+beatrun.toolsmenu.courses.uploadcourse=Опубликовать Текущий Курс в Базу курсов
+
+beatrun.toolsmenu.courses.updatecourse=Обновить курс в Базе
+beatrun.toolsmenu.courses.updatecoursehelp=Обновляет курс в базе по коду на текущий
+
+# Tools Menu HUD Section
+beatrun.toolsmenu.hud.name=HUD
+beatrun.toolsmenu.hud.desc=Настройки HUD
+
+beatrun.toolsmenu.hud.dynamic=Динамический HUD
+beatrun.toolsmenu.hud.dynamicdesc=Прячет HUD во время движения
+
+beatrun.toolsmenu.hud.sway=Покачивание HUD
+beatrun.toolsmenu.hud.swaydesc=Покачивает HUD при разнообразных действиях
+
+beatrun.toolsmenu.hud.reticle=Показать Точку
+beatrun.toolsmenu.hud.reticledesc=Показывает точку по середине экрана
+
+beatrun.toolsmenu.hud.nametags=Показать Ники
+beatrun.toolsmenu.hud.nametagsdesc=Показывает ники над игроками
+
+beatrun.toolsmenu.hud.hudxp=Показать XP в HUD
+beatrun.toolsmenu.hud.hudxpdesc=Показывает весь XP в HUD
+
+beatrun.toolsmenu.hud.wind=Эффект Ветра
+beatrun.toolsmenu.hud.winddesc=Шум ветра во время бега
+
+beatrun.toolsmenu.hud.fov=Угол Обзора
+beatrun.toolsmenu.hud.fovdesc=Вам нужно сделать респавн после изменения FOV!
+
+beatrun.toolsmenu.hud.hidden=Скрыть HUD
+beatrun.toolsmenu.hud.hiddendesc=0 - Показать\n1 - Только режим\n2 - Скрыть полностью
+
+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=Настройки покачивания камеры
+
+beatrun.toolsmenu.viewbob.stabilization=Стабилизация Покачивания
+beatrun.toolsmenu.viewbob.stabilizationdesc=Включите чтобы снизить покачивание камеры центрируя её
+beatrun.toolsmenu.viewbob.intensity=Интенсивность Покачивания Камеры
+
+# Tools Menu Gameplay Section
+beatrun.toolsmenu.gameplay.name=Геймплей
+beatrun.toolsmenu.gameplay.desc=Настройки геймплея
+
+beatrun.toolsmenu.gameplay.quickturnground=Quickturn на Земле
+beatrun.toolsmenu.gameplay.quickturngrounddesc=Переключает Quickturn будучи на земле (быстрый разворот)
+
+beatrun.toolsmenu.gameplay.quickturnhandsonly=Quickturn Только с Руками
+beatrun.toolsmenu.gameplay.quickturnhandsonlydesc=Переключает Quickturn только с "Runner Hands"
+
+beatrun.toolsmenu.gameplay.puristmode=Режим Purist
+beatrun.toolsmenu.gameplay.puristmodedesc=Режим Purist это клиентский параметр который сильно снижает движение игрока в стороны будучи в воздухе, прямо как в оригинальное ME.\n0 = Нет ограничений\n1 = Снижает движение игрока в воздухе в стороны
+
+beatrun.toolsmenu.gameplay.disablegrapple=Отключить Крюк-Кошку
+beatrun.toolsmenu.gameplay.disablegrappledesc=Отключает использование крюка-кошки
+
+# Tools Menu Misc Section
+beatrun.toolsmenu.misc.name=Другое
+beatrun.toolsmenu.misc.desc=Другие настройки
+
+beatrun.toolsmenu.misc.propspawn=Создание Пропов/Оружия
+beatrun.toolsmenu.misc.propspawndesc=Позволяет создавать игрокам без админ прав оружие, пропы и энтити
+
+beatrun.toolsmenu.misc.overdrivemp=Overdrive в Мультиплеере
+beatrun.toolsmenu.misc.overdrivempdesc=Разрешает использование Overdrive в мультиплеере
+
+# Tools Menu Moves Section
+beatrun.toolsmenu.moves.name=Движения
+beatrun.toolsmenu.moves.desc=Настройки движений
+beatrun.toolsmenu.moves.help=Нырнуть Можно с Помощью Ctrl + ПКМ Будучи в Воздухе!\nOverdrive Переключается с Помощью E + ЛКМ.
+
+beatrun.toolsmenu.moves.speedlimit=Ограничение Скорости
+beatrun.toolsmenu.moves.speedlimitdesc=Изменяет ограничение скорости передвижения\nПо умолчанию: 325
+
+beatrun.toolsmenu.moves.forcepuristmode=Принудительный Режим Purist
+beatrun.toolsmenu.moves.forcepuristmodedesc=Включает режим Purist для всех игроков
+
+beatrun.toolsmenu.moves.realisticwallrunning="Реалистичный" Бег по Стенам
+beatrun.toolsmenu.moves.realisticwallrunningdesc=Нет потери в скорости если отключить
+
+beatrun.toolsmenu.moves.kickglitch=Kick Glitch
+beatrun.toolsmenu.moves.kickglitchdesc=Переключает Kick Glitch\nНажмите ЛКМ во время бега по стене и зажатии/нажатии на прыжок сразу после
+
+beatrun.toolsmenu.moves.kickglitchversion=Версия Kick Glitch
+beatrun.toolsmenu.moves.kickglitchversiondesc=Вкл - Старая версия\nDisabled - Новая версия\nНовая версия использует механику из ME которая создаёт небольшую платформу под игроком
+
+beatrun.toolsmenu.moves.quakejump=Quake Jump
+beatrun.toolsmenu.moves.quakejumpdesc=Переключает Quake Jump\nНажмите Прыжок сразу после Side Step
+
+beatrun.toolsmenu.moves.sidestep=Side Step
+beatrun.toolsmenu.moves.sidestepdesc=Переключает Side Step\nA/D + ПКМ
+
+beatrun.toolsmenu.moves.disarm=Разоружение
+beatrun.toolsmenu.moves.disarmdesc=Переключает возможность разоружить (убить) NPC\nНажмите ИСПОЛЬЗОВАТЬ на NPC
+
+beatrun.toolsmenu.moves.divesettings=Настройки ныряния
+
+beatrun.toolsmenu.moves.totsugeki=Totsugeki
+beatrun.toolsmenu.moves.totsugekidesc=Переключает Totsugeki\nНырнуть сразу после Quake Jump
+
+beatrun.toolsmenu.moves.totsugekispam=Спам Totsugeki
+beatrun.toolsmenu.moves.totsugekispamdesc=Переключает возможность спамить Totsugeki
+
+beatrun.toolsmenu.moves.totsugekiheading=Угол Totsugeki
+beatrun.toolsmenu.moves.totsugekiheadingdesc=Позволяет делать Totsugeki по оси X (вверх/вниз)
+
+beatrun.toolsmenu.moves.totsugekidirection=Направление Totsugeki
+beatrun.toolsmenu.moves.totsugekidirectiondesc=Позволяет делать Totsugeki в направлении глаз\nCombined with Spam and Heading Allows You to Fly =)
+
+# Tools Menu Gamemodes Section
+beatrun.toolsmenu.gamemodes.name=Режимы
+beatrun.toolsmenu.gamemodes.desc=Настройка режимов
+beatrun.toolsmenu.gamemodes.error=Другой режим уже запущен!
+
+beatrun.toolsmenu.gamemodes.infection=Переключить Infection
+beatrun.toolsmenu.gamemodes.infectionstarttime=Время перед началом
+beatrun.toolsmenu.gamemodes.infectiongametime=Продолжительность
+beatrun.toolsmenu.gamemodes.infectiontime=Время в секундах
+beatrun.toolsmenu.gamemodes.datatheft=Переключить Data Theft
+beatrun.toolsmenu.gamemodes.deathmatch=Переключить Deathmatch
+
+# Checkpoints
+beatrun.checkpoints.countdown1=Раз
+beatrun.checkpoints.countdown2=Два
+beatrun.checkpoints.countdown3=ПОШЁЛ!
+beatrun.checkpoints.speedometer=%s км/ч
+
+# DataTheft
+beatrun.datatheft.name=Data Theft (%s)
+beatrun.datatheft.start=Data Theft! Убивайте игроков, собирайте кубики и вкладывайте в банк и зарабатывайте очки
+
+# Deathmatch
+beatrun.deathmatch.name=Deathmatch
+beatrun.deathmatch.start=Deathmatch! Убивайте игроков чтобы зарабатывать очки
+
+# Infection
+beatrun.infection.name=Infection
+beatrun.infection.infectedtext=(Заражённый)
+beatrun.infection.humantext=(Человек)
+beatrun.infection.start=Infection! Дотрагивайтесь до других игроков чтобы заразить их\n%s игрок(а/ов) будет выбрано через %s сек
+beatrun.infection.nosurvivors=Никто...
+beatrun.infection.infected=был заражён!
+beatrun.infection.infectedby=заразил
+beatrun.infection.award=Вы получили 200 XP за выживание!
+beatrun.infection.awardinfected=Вы получили 100 XP за спавн заражённым!
+beatrun.infection.end=Игра окончена!\nВыжившие: %s\nПерезапуск через 15 сек

beatrun/gamemodes/beatrun/entities/entities/br_rabbitfrog/shared.lua

@@ -202,6 +202,7 @@ local function RabbitCalcView(ply, origin, ang)
 			neweye = true
 
 			ply:CLViewPunch(Angle(12, 0, 0))
+
 			if VManip then
 				VManip:PlayAnim("vault")
 			end

beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua

@@ -100,7 +100,7 @@ function ENT:DrawTranslucent()
 		render.DrawBeam(newpos, newpos + circleup, 8, 0, 1, red, true)
 	end
 
-	local nextCP = Checkpoints[self:GetCPNum() + 1] or self
+	local nextCP = IsValid(Checkpoints[self:GetCPNum() + 1]) and Checkpoints[self:GetCPNum() + 1] or self
 
 	local selfpos = self:GetPos() + checkheight
 	local fwAng = (nextCP:GetPos() - selfpos):GetNormalized():Angle()

beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua

@@ -1,9 +1,7 @@
-local cvarwindsound
+local windsound
-local minimalvm
 
 if CLIENT then
-	minimalvm = CreateClientConVar("Beatrun_MinimalVM", 1, true, true, "Lowers the running viewmodel", 0, 1)
+	windsound = CreateClientConVar("Beatrun_Wind", 1, true, false, "Wind noises", 0, 1)
-	cvarwindsound = CreateClientConVar("Beatrun_Wind", 1, true, false, "Wind noises", 0, 1)
 
 	SWEP.PrintName = "Runner Hands"
 	SWEP.Slot = 0
@@ -12,7 +10,7 @@ if CLIENT then
 	SWEP.DrawCrosshair = false
 
 	hook.Add("VManipPrePlayAnim", "LOCNoVManip", function()
-		if LocalPlayer():GetActiveWeapon():GetClass() == "runnerhands" or blinded then return false end
+		if LocalPlayer():UsingRH() or blinded then return false end
 	end)
 end
 
@@ -73,10 +71,10 @@ function SWEP:SetupDataTables()
 	self:NetworkVar("Float", 2, "PunchReset")
 end
 
-local runseq = {
+-- local runseq = {
-	[6] = true,
+-- 	[6] = true,
-	[7] = true
+-- 	[7] = true
-}
+-- }
 
 local oddseq = {
 	[8] = true,
@@ -86,22 +84,6 @@ local oddseq = {
 }
 
 function SWEP:GetViewModelPosition(pos, ang)
-	if minimalvm:GetBool() then
-		if not self.posz then
-			self.posz = pos.z
-		end
-
-		local seq = self:GetSequence()
-
-		if runseq[seq] then
-			self.posz = Lerp(10 * FrameTime(), self.posz, -2)
-		else
-			self.posz = Lerp(10 * FrameTime(), self.posz, 0)
-		end
-
-		pos.z = pos.z + self.posz
-	end
-
 	if oddseq[self:GetSequence()] then return pos, ang end
 
 	self.BobScale = 0
@@ -142,6 +124,7 @@ local fallct = 0
 function SWEP:Think()
 	local ply = self:GetOwner()
 	local viewmodel = ply:GetViewModel()
+
 	if not IsValid(viewmodel) then return end
 
 	if self:GetHoldType() == "fist" and CurTime() > self:GetPunchReset() then
@@ -163,6 +146,36 @@ function SWEP:Think()
 	local injump = curseq == 13 or curseq == 14 or curseq == 17 or curseq == -1 or curseq == 1
 	infall = curseq == 19
 
+	--[[ what a piece of shit, send help
+	if vel:Length() == 0 and util.QuickTrace(ply:GetShootPos(), ply:GetAimVector() * 30, ply).Hit and ply:GetMoveType() ~= MOVETYPE_NOCLIP and not ply:Crouching() and ply:WaterLevel() == 0 and ply:GetWallrun() == 0 then
+		if (math.floor(ply:LocalEyeAngles().y) <= 35 and math.floor(ply:LocalEyeAngles().y) >= 5) or (math.floor(ply:LocalEyeAngles().y) <= 125 and math.floor(ply:LocalEyeAngles().y) >= 95) or (math.floor(ply:LocalEyeAngles().y) <= -55 and math.floor(ply:LocalEyeAngles().y) >= -85) or (math.floor(ply:LocalEyeAngles().y) <= -145 and math.floor(ply:LocalEyeAngles().y) >= -175) then
+			if CLIENT then
+				BodyLimitX = 20
+
+				return ArmInterrupt("standhandwallright")
+			elseif game.SinglePlayer() then
+				return ply:SendLua("BodyLimitX = 20 ArmInterrupt('standhandwallright')")
+			end
+		elseif (math.floor(ply:LocalEyeAngles().y) <= 5 and math.floor(ply:LocalEyeAngles().y) >= -5) or (math.floor(ply:LocalEyeAngles().y) <= 95 and math.floor(ply:LocalEyeAngles().y) >= 85) or (math.floor(ply:LocalEyeAngles().y) <= -85 and math.floor(ply:LocalEyeAngles().y) >= -95) or (math.floor(ply:LocalEyeAngles().y) <= -175 or math.floor(ply:LocalEyeAngles().y) >= 175) then
+			if CLIENT then
+				BodyLimitX = 20
+
+				return ArmInterrupt("standhandwallboth")
+			elseif game.SinglePlayer() then
+				return ply:SendLua("BodyLimitX = 20 ArmInterrupt('standhandwallboth')")
+			end
+		elseif (math.floor(ply:LocalEyeAngles().y) <= 5 and math.floor(ply:LocalEyeAngles().y) >= -35) or (math.floor(ply:LocalEyeAngles().y) <= 85 and math.floor(ply:LocalEyeAngles().y) >= 55) or (math.floor(ply:LocalEyeAngles().y) <= -95 and math.floor(ply:LocalEyeAngles().y) >= -125) or (math.floor(ply:LocalEyeAngles().y) <= 175 and math.floor(ply:LocalEyeAngles().y) >= 145) then
+			if CLIENT then
+				BodyLimitX = 20
+
+				return ArmInterrupt("standhandwallleft")
+			elseif game.SinglePlayer() then
+				return ply:SendLua("BodyLimitX = 20 ArmInterrupt('standhandwallleft')")
+			end
+		end
+	end
+	--]]
+
 	self:SetSideStep((curseq == 15 or curseq == 16) and GetConVar("Beatrun_SideStep"):GetBool())
 
 	local insidestep = self:GetSideStep()
@@ -296,7 +309,7 @@ function SWEP:Think()
 			self.RunWind2 = CreateSound(self, "runwind.wav")
 		end
 
-		if velocity > 250 and cvarwindsound:GetBool() then
+		if velocity > 250 and windsound:GetBool() then
 			self.RunWind1:Play()
 			self.RunWind2:Play()
 
@@ -510,4 +523,4 @@ function SWEP:PrimaryAttack()
 end
 
 function SWEP:SecondaryAttack()
-end
+end

beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua

@@ -67,7 +67,7 @@ end
 
 function SWEP:PrimaryAttack()
 	self:CallOnClient("PrimaryAttack")
-	local ply = self.Owner
+	local ply = self:GetOwner()
 
 	if not self.points[#self.points] or (ply:EyePos() + ply:EyeAngles():Forward() * 50):Distance(self.points[#self.points]) > 5 then
 		table.insert(self.points, ply:EyePos() + ply:EyeAngles():Forward() * 50)
@@ -77,17 +77,20 @@ end
 function SWEP:SecondaryAttack()
 	self:CallOnClient("SecondaryAttack")
 
-	local ply = self.Owner
+	local ply = self:GetOwner()
 
 	self.center:Set(ply:GetEyeTrace().HitPos)
 end
 
 hook.Add("PostDrawTranslucentRenderables", "ShapeGun", function()
-	local ply = Entity(1)
+	if not CLIENT then return end
-	local wep = ply:GetActiveWeapon() or nil
 
-	if IsValid(wep) and wep:GetClass() == "shapedrawer" then
+	local ply = LocalPlayer()
-		for k, v in ipairs(wep.points) do
+	local wep = ply:GetActiveWeapon()
+	local isShapeDrawer = IsValid(wep) and wep:GetClass() == "shapedrawer"
+
+	if IsValid(ply) and isShapeDrawer then
+		for _, v in ipairs(wep.points) do
 			render.DrawWireframeBox(v, angle_zero, Vector(-1, -1, -1), Vector(1, 1, 1))
 		end
 

beatrun/gamemodes/beatrun/entities/weapons/ziplinegun/shared.lua

@@ -66,6 +66,8 @@ function SWEP:PrimaryAttack()
 	if SERVER then
 		local zip = CreateZipline(ply:EyePos(), ply:GetEyeTrace().HitPos)
 
+		zip:SetTwoWay(true)
+
 		table.insert(self.ziplines, zip)
 	end
 end

beatrun/gamemodes/beatrun/gamemode/Maps/dm_cubix_fix.lua

@@ -186,7 +186,7 @@ local spawn = {
 }
 
 function PrintAllBars()
-	for k, v in pairs(ents.FindByClass("br_swingbar")) do
+	for _, v in pairs(ents.FindByClass("br_swingbar")) do
 		local pos, ang = v:GetPos(), v:GetAngles()
 		local str = "{\"br_swingbar\", Vector(" .. pos.x .. ", " .. pos.y .. ", " .. pos.z .. "), Angle(" .. ang.x .. ", " .. ang.y .. ", " .. ang.z .. ")},"
 		print(str)
@@ -194,7 +194,7 @@ function PrintAllBars()
 end
 
 function PrintAllCampBoxes()
-	for k, v in pairs(ents.FindByClass("br_anticampbox")) do
+	for _, v in pairs(ents.FindByClass("br_anticampbox")) do
 		local pos, ang = v:GetPos(), v:GetAngles()
 		local str = "{\"br_anticampbox\", Vector(" .. pos.x .. ", " .. pos.y .. ", " .. pos.z .. "), Angle(" .. ang.x .. ", " .. ang.y .. ", " .. ang.z .. ")},"
 		print(str)
@@ -202,7 +202,7 @@ function PrintAllCampBoxes()
 end
 
 local function CreateSpawnEntities()
-	for k, v in ipairs(spawn) do
+	for _, v in ipairs(spawn) do
 		BRProtectedEntity(v[1], v[2], v[3])
 	end
 end

beatrun/gamemodes/beatrun/gamemode/cl/0_UI.lua

@@ -203,13 +203,13 @@ end
 local function AEUIDraw()
 	if AEUI.NoDraw then return end
 
-	for k, v in ipairs(AEUI.Panels) do
+	for _, v in ipairs(AEUI.Panels) do
 		surface.SetAlphaMultiplier(v.alpha or 1)
 		AEUI:DrawPanel(v)
 		surface.SetAlphaMultiplier(1)
 
 		if v.elements then
-			for l, b in ipairs(v.elements) do
+			for _, b in ipairs(v.elements) do
 				AEUI:DrawElement(v, b)
 			end
 		end
@@ -288,7 +288,7 @@ hook.Add("StartCommand", "AEUI_StartCommand", function(ply, cmd)
 	local click = input.WasMousePressed(MOUSE_LEFT)
 
 	if hoveredpanel then
-		for k, v in ipairs(hoveredpanel.elements) do
+		for _, v in ipairs(hoveredpanel.elements) do
 			if (v.onclick or v.hover) and (not v.greyed or not v.greyed()) and v.w and v.h then
 				local x = SScaleX(hoveredpanel.x) + SScaleX(v.x)
 				local y = SScaleY(hoveredpanel.y) + SScaleY(v.y) + (hoveredpanel.scroll or 0)

beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua

@@ -23,30 +23,33 @@ end
 local addons = 0
 
 local incompatible = {
-	["1581533176"] = true,
+	["1581533176"] = true, -- The Aperture [Reupload]
-	["2675972006"] = true,
+	["2675972006"] = true, -- Custom Loadout
-	["378401390"] = true,
+	["378401390"] = true, -- Quake/Half-Life View bobbing
-	["2027577882"] = true,
+	["2027577882"] = true, -- Mantle + Wallrun
-	["1190705063"] = true,
+	["1190705063"] = true, -- Lerped View Models
-	["123514260"] = true,
+	["123514260"] = true, -- SharpeYe
-	["2416989205"] = true,
+	["2416989205"] = true, -- Quick Slide
-	["2591814455"] = true,
+	["2591814455"] = true, -- [PF] Half-Life: Alyx
-	["240159269"] = true,
+	["240159269"] = true, -- S.M.A.R.T.:Smooth Parkour Movement
-	["2230307188"] = true,
+	["2230307188"] = true, -- EFT Walk Sounds (Footsteps)
-	["2137973704"] = true,
+	["2137973704"] = true, -- [PF] Modern Warfare 2
-	["577145478"] = true,
+	["577145478"] = true, -- ViewMod
-	["1632091428"] = true,
+	["1632091428"] = true, -- Fine Speed
-	["1622199072"] = true,
+	["1622199072"] = true, -- SaVav Parkour Mod
-	["2840019616"] = true,
+	["2840019616"] = true, -- cBobbing (Reupped & Fixed)
-	["583517911"] = true,
+	["583517911"] = true, -- Eye View Attachment
-	["2106330193"] = true,
+	["2106330193"] = true, -- BSMod Punch SWEP + Kick & KillMoves
-	["2593047682"] = true,
+	["2593047682"] = true, -- Viewpunch Viewbob
-	["142911907"] = true,
+	["142911907"] = true, -- Advanced Combat Rolls
-	["2316713217"] = true,
+	["2316713217"] = true, -- Player Speeds Changer 2.0 [REUPLOAD]
-	["2052642961"] = true,
+	["2635378860"] = true, -- MW/WZ Skydive/Parachute + Infil
-	["2635378860"] = true,
+	["2919957168"] = true, -- Modern Warfare II - Takedowns & Revive System
-	["2919957168"] = true,
+	["2600234804"] = true, -- ASTW2 - Base Weapons
-	["104815552"] = true
+	["2824714462"] = true, -- [TFA] Screen Shake
+	["3037375111"] = true, -- Quick Slide With Legs
+	["748422181"] = true, -- FOV Changer
+	["2930331275"] = true -- Realistic Fragmentation System
 }
 
 local warnpanel = {
@@ -79,7 +82,7 @@ local warntext = {
 	y = warnpanel.h * 0.125,
 	centered = true,
 	color = color_white,
-	string = "NOTICE\nPlease disable the following addons before playing\nor submitting any issues to GitHub:"
+	string = language.GetPhrase("beatrun.addonwarning.warntext")
 }
 
 table.insert(warnpanel.elements, warntext)
@@ -91,21 +94,18 @@ local quitbutton = {
 	y = warnpanel.h * 0.85,
 	centered = true,
 	color = color_white,
-	string = "Return to Main Menu",
+	string = "#beatrun.addonwarning.quitbutton",
 	onclick = function(self)
 		surface.PlaySound("garrysmod/ui_click.wav")
-		MsgC(Color(255, 100, 100), "Quitting Beatrun due to conflicting addons!")
 
-		timer.Simple(0.5, function()
+		timer.Simple(0.2, function()
-			RunConsoleCommand("killserver")
+			RunConsoleCommand("disconnect")
 		end)
-
-		self.onclick = nil
 	end
 }
 
 table.insert(warnpanel.elements, quitbutton)
-AEUI:AddButton(warnpanel, "Play", warnclosebutton, "AEUIDefault", warnpanel.w * 0.5, warnpanel.h * 0.93, true)
+AEUI:AddButton(warnpanel, "#beatrun.addonwarning.play", warnclosebutton, "AEUIDefault", warnpanel.w * 0.5, warnpanel.h * 0.93, true)
 
 local conflictlist = {
 	type = "Text",
@@ -132,8 +132,6 @@ local function CheckAddons()
 		end
 	end
 
-	print(conflictlist.string)
-
 	return addons
 end
 
@@ -142,7 +140,7 @@ local function WarningIcon()
 		surface.SetFont("BeatrunHUD")
 		surface.SetTextPos(2, 0)
 		surface.SetTextColor(220, 20, 20, math.abs(math.sin(CurTime() * 2) * 255))
-		surface.DrawText("CONFLICTING ADDONS FOUND")
+		surface.DrawText("#beatrun.addonwarning.conflictfound")
 
 		return
 	else
@@ -161,4 +159,4 @@ if conflictlist.string ~= "" then
 		AEUI:AddPanel(warnpanel)
 		AEUI:AddPanel(conflictpanel)
 	end)
-end
+end

beatrun/gamemodes/beatrun/gamemode/cl/BodyAnim.lua

@@ -10,11 +10,14 @@ BodyAnimString = "nil"
 BodyAnimMDLString = "nil"
 BodyAnimSpeed = 1
 bodyanimlastattachang = Angle(0, 0, 0)
+
 followplayer = true
 deleteonend = true
 lockang = false
+
 CamAddAng = false
 CamIgnoreAng = false
+
 -- local BodyAnimPos = Vector(0, 0, 0)
 -- local BodyAnimAngLerp = Angle(0, 0, 0)
 -- local DidDraw = false
@@ -24,29 +27,38 @@ local savedeyeangb = Angle(0, 0, 0)
 -- local bodylockview = false
 -- local bodyanimdone = false
 -- local holstertime = 0
+
 local animmodelstring = ""
 local showweapon = false
 local showvm = false
 local usefullbody = false
 local ignorez = false
 local customcycle = false
+
 deathanim = false
+
 local allowmove = false
 local allowedangchange = false
 local attach, attachId, weapontoidle = nil, nil, nil
 local smoothend = false
 local endlerp = 0
+
 camoffset = Vector()
 camjoint = "eyes"
+
 BodyAnimCrouchLerp = 1
 BodyAnimCrouchLerpZ = 0
 BodyAnimLimitEase = false
+
 CamShake = false
 CamShakeAng = Angle()
 CamShakeMult = 1
+
 local lastangy = 0
+
 viewtiltlerp = Angle()
 ViewTiltAngle = Angle()
+
 local BodyAnimStartPos = Vector()
 local view = {}
 local justremoved = false
@@ -108,7 +120,7 @@ function RemoveBodyAnim(noang)
 	local currentwep = ply:GetActiveWeapon()
 	local vm = ply:GetViewModel()
 
-	if IsValid(currentwep) and currentwep:GetClass() ~= "runnerhands" then
+	if ply:notUsingRH() then
 		if currentwep.PlayViewModelAnimation then
 			currentwep:PlayViewModelAnimation("Draw")
 		else
@@ -210,13 +222,13 @@ function CacheLerpBodyAnim()
 
 		local pos = LocalPlayer():GetPos()
 		-- local posdelta = pos - matrixfrompos
-		local self = BodyAnim
+		local this = BodyAnim
-		self.m = self.m or Matrix()
+		this.m = this.m or Matrix()
 
 		local from = matrixfrom
 		local to = matrixto
 
-		for bone = 0, self:GetBoneCount() - 1 do
+		for bone = 0, this:GetBoneCount() - 1 do
 			if not armbones[BodyAnim:GetBoneName(bone)] then
 				if not to[bone] then
 					to[bone] = {{}, {}, {}}
@@ -228,7 +240,7 @@ function CacheLerpBodyAnim()
 				from[bone] = cachebody[bone]:FastToTable(from[bone]) or from[bone]
 				to[bone] = to[bone] or ModelBoneMatrix:FastToTable(to[bone])
 
-				local bonematrix = self:GetBoneMatrix(bone)
+				local bonematrix = this:GetBoneMatrix(bone)
 				bonematrix:SetTranslation(bonematrix:GetTranslation() - pos)
 
 				to[bone] = bonematrix:FastToTable(to[bone])
@@ -243,8 +255,8 @@ function CacheLerpBodyAnim()
 					v[4] = LerpL(transitionlerp, from[4], v[4])
 				end
 
-				if not self.m then
+				if not this.m then
-					self.m = Matrix(to[bone])
+					this.m = Matrix(to[bone])
 				else
 					local bt = to[bone]
 					local bt1 = bt[1]
@@ -252,12 +264,12 @@ function CacheLerpBodyAnim()
 					local bt3 = bt[3]
 					slot15 = bt[4]
 
-					self.m:SetUnpacked(bt1[1], bt1[2], bt1[3], bt1[4], bt2[1], bt2[2], bt2[3], bt2[4], bt3[1], bt3[2], bt3[3], bt3[4], 0, 0, 0, 1)
+					this.m:SetUnpacked(bt1[1], bt1[2], bt1[3], bt1[4], bt2[1], bt2[2], bt2[3], bt2[4], bt3[1], bt3[2], bt3[3], bt3[4], 0, 0, 0, 1)
 				end
 
-				self.m:SetTranslation(self.m:GetTranslation() + pos)
+				this.m:SetTranslation(this.m:GetTranslation() + pos)
-				self.m:SetScale(scalevec)
+				this.m:SetScale(scalevec)
-				self:SetBoneMatrix(bone, self.m)
+				this:SetBoneMatrix(bone, this.m)
 			end
 		end
 
@@ -331,8 +343,8 @@ function StartBodyAnim(animtable)
 	if not IsValid(ply:GetHands()) then return end
 
 	local plymodel = ply
-	local playermodel = string.Replace(ply:GetModel(), "models/models/", "models/")
+	local playermodel = ply:GetModel()
-	local handsmodel = string.Replace(ply:GetHands():GetModel(), "models/models/", "models/")
+	local handsmodel = ply:GetHands():GetModel()
 
 	if usefullbody == 2 then
 		BodyAnimMDL = ClientsideModel(playermodel, RENDERGROUP_BOTH)
@@ -468,8 +480,7 @@ function BodyAnimCalcView2(ply, pos, angles, fov)
 		return
 	end
 
-	-- This is the issue with disappearing model when sliding, should be fixed for now
+	if IsValid(BodyAnim) and pos:Distance(ply:EyePos()) > 20 then
-	if IsValid(BodyAnim) and pos:Distance(ply:EyePos()) > 20 then -- TODO: Something if appears again...
 		if updatethirdperson then
 			ply:SetNoDraw(false)
 			BodyAnim:SetNoDraw(true)
@@ -494,9 +505,8 @@ function BodyAnimCalcView2(ply, pos, angles, fov)
 
 					if ply:Crouching() then
 						local from = BodyAnimCrouchLerpZ
-						local activewep = ply:GetActiveWeapon()
 
-						if IsValid(activewep) and activewep:GetClass() == "runnerhands" then
+						if ply:UsingRH() then
 							from = ply:EyePos().z - 64
 						end
 
@@ -696,8 +706,6 @@ function BodyAnimCalcView2(ply, pos, angles, fov)
 end
 
 hook.Add("CreateMove", "BodyLimitMove", function(cmd)
-	-- local ply = LocalPlayer()
-
 	if IsValid(BodyAnimMDL) and not allowmove then
 		cmd:ClearButtons()
 		cmd:ClearMovement()

beatrun/gamemodes/beatrun/gamemode/cl/BuildModeHUD.lua

@@ -57,9 +57,10 @@ local function infostring()
 	y = math.Round(y)
 	p = math.Round(p)
 
-	local a = "Index: " .. BuildModeIndex .. "\nSelected: " .. table.Count(buildmode_selected) .. "\nAngle: " .. p .. ", " .. y .. ", " .. r
+	local angle = p .. ", " .. y .. ", " .. r
+	local str = language.GetPhrase("beatrun.buildmodehud.info"):format(BuildModeIndex, table.Count(buildmode_selected), angle)
 
-	return a
+	return str
 end
 
 AEUI:AddText(bminfo, infostring, "AEUIDefault", bminfo.w / 2, bminfo.h / 2 - 20, true)
@@ -75,25 +76,27 @@ end
 local function PanelElementsToggle(e)
 	local showingents = propspanel.elements == EntitiesElements
 	propspanel.elements = showingents and propspanel_elements or EntitiesElements
-	e.string = showingents and "Menu / Props" or "Menu / Entities"
+
+	e.string = showingents and "#beatrun.buildmodehud.props" or "#beatrun.buildmodehud.entities"
+
 	propspanel.maxscroll = nil
 	propspanel.scroll = nil
 end
 
-local b = AEUI:AddButton(bmbuttons, "Drag (G)", BuildModeHUDButton, "AEUIDefault", 2, 0, false)
+local b = AEUI:AddButton(bmbuttons, "#beatrun.buildmodehud.drag", BuildModeHUDButton, "AEUIDefault", 2, 0, false)
 b.key = KEY_G
 b.greyed = GreyButtons
-local b = AEUI:AddButton(bmbuttons, "Copy (SHIFT+D)", BuildModeHUDButton, "AEUIDefault", 2, 25, false)
+local b = AEUI:AddButton(bmbuttons, "#beatrun.buildmodehud.copy", BuildModeHUDButton, "AEUIDefault", 2, 25, false)
 b.key = KEY_D
 b.greyed = GreyButtons
-local b = AEUI:AddButton(bmbuttons, "Delete (DEL/BCKSPC)", BuildModeHUDButton, "AEUIDefault", 2, 50, false)
+local b = AEUI:AddButton(bmbuttons, "#beatrun.buildmodehud.delete", BuildModeHUDButton, "AEUIDefault", 2, 50, false)
 b.key = KEY_DELETE
 b.greyed = GreyButtons
-local b = AEUI:AddButton(bmbuttons, "Highlight (T)", BuildModeHUDButton, "AEUIDefault", 2, 75, false)
+local b = AEUI:AddButton(bmbuttons, "#beatrun.buildmodehud.highlight", BuildModeHUDButton, "AEUIDefault", 2, 75, false)
 b.key = KEY_T
 b.greyed = GreyButtons
 
-AEUI:AddButton(elementstogglepanel, "Menu / Props", PanelElementsToggle, "AEUILarge", 192, 20, true)
+AEUI:AddButton(elementstogglepanel, "#beatrun.buildmodehud.props", PanelElementsToggle, "AEUILarge", 192, 20, true)
 
 local dummy = ClientsideModel("models/hunter/blocks/cube025x025x025.mdl")
 
@@ -150,7 +153,6 @@ end
 local function BMPropClick(e)
 	BuildModeIndex = e.prop or 0
 
-	print(e.prop)
 	LocalPlayer():EmitSound("buttonclick.wav")
 
 	if BuildModeIndex == 0 then
@@ -168,7 +170,7 @@ end
 
 local img = AEUI:AddImage(propspanel, Material("vgui/empty.png"), BMPropClick, 0, 0, 64, 64)
 img.prop = 0
-img.hover = "Select"
+img.hover = "#beatrun.buildmodehud.select"
 local row = 1
 local col = 0
 
@@ -194,7 +196,7 @@ end
 
 local img = AEUI:AddImage(propspanel, Material("vgui/empty.png"), BMPropClick, 64 * row, 64 * col, 64, 64)
 img.prop = 0
-img.hover = "Select"
+img.hover = "#beatrun.buildmodehud.select"
 
 local function BuildModeElements()
 	propspanel.elements = EntitiesElements
@@ -206,7 +208,7 @@ local function BuildModeElements()
 
 	local img = AEUI:AddImage(propspanel, Material("vgui/empty.png"), BMPropClick, 0, 0, 64, 64)
 	img.prop = 0
-	img.hover = "Select"
+	img.hover = "#beatrun.buildmodehud.select"
 
 	local buildmode_enticons = {
 		br_swingbar = Material("vgui/editor/swingbar.png"),
@@ -221,7 +223,7 @@ local function BuildModeElements()
 	}
 
 	local buildmode_entnames = {
-		br_zipline = "Zipline (SHIFT = 2-Way)"
+		br_zipline = "#beatrun.buildmodehud.zipline"
 	}
 
 	local obsolete = Material("editor/obsolete")

beatrun/gamemodes/beatrun/gamemode/cl/CoursesDatabase.lua

@@ -1,19 +1,26 @@
-local apikey = CreateClientConVar("Beatrun_Apikey", "0", true, false, "API key")
+local apikey = CreateClientConVar("Beatrun_Apikey", "0", true, false, language.GetPhrase("beatrun.convars.apikey"))
-local domain = CreateClientConVar("Beatrun_Domain", "courses.beatrun.ru", true, false, "Online courses domain")
+local domain = CreateClientConVar("Beatrun_Domain", "courses.beatrun.ru", true, false, language.GetPhrase("beatrun.convars.domain"))
 
 local QueuedArgs = NULL
 local QueuedFunction = NULL
-concommand.Add("beatrun_confirm", function()
+local currentMap = game.GetMap()
+
+concommand.Add("Beatrun_Confirm", function()
 	if QueuedArgs and QueuedFunction then
 		QueuedFunction(QueuedArgs)
+
 		return
 	end
+
 	if QueuedFunction then
 		QueuedFunction()
+
 		return
 	end
 end)
-concommand.Add("beatrun_cancel", function() 
+
+concommand.Add("Beatrun_Cancel", function()
+	QueuedArgs = NULL
 	QueuedFunction = NULL
 end)
 
@@ -23,22 +30,22 @@ local function GetCurrentMapWorkshopID()
 
 		_, addon_folders = file.Find("*", addon.title)
 
-		if file.Exists("maps/" .. game.GetMap() .. ".bsp", addon.title) then return addon.wsid end
+		if file.Exists("maps/" .. currentMap .. ".bsp", addon.title) then return addon.wsid end
 	end
 
 	return 0
 end
 
 function UploadCourse()
-	if Course_Name == "" or Course_ID == "" then return print("Can't upload in Freeplay") end
+	if Course_Name == "" or Course_ID == "" then return print(language.GetPhrase("beatrun.coursesdatabase.cantuploadfreeplay")) end
 
 	local url = domain:GetString() .. "/upload.php"
-	local data = file.Open("beatrun/courses/" .. game.GetMap() .. "/" .. Course_ID .. ".txt", "rb", "DATA")
+	local data = file.Open("beatrun/courses/" .. currentMap .. "/" .. Course_ID .. ".txt", "rb", "DATA")
 	local filedata = util.Decompress(data:Read(data:Size()))
 
 	http.Post(url, {
 		key = apikey:GetString(),
-		map = string.Replace(game.GetMap(), " ", "-"),
+		map = string.Replace(currentMap, " ", "-"),
 		course_data = util.Base64Encode(filedata, true),
 		mapid = GetCurrentMapWorkshopID()
 	}, function(body, length, headers, code) -- onSuccess function
@@ -54,24 +61,24 @@ end
 
 concommand.Add("Beatrun_UploadCourse", function()
 	QueuedFunction = UploadCourse
-	print("You're trying to upload a course with the name "..Course_Name.." and on map "..game.GetMap()..".")
+
-	print("Write beatrun_confirm to continue, or beatrun_cancel to stop.")
+	print(language.GetPhrase("beatrun.coursesdatabase.upload1"):format(Course_Name, currentMap))
+	print(language.GetPhrase("beatrun.coursesdatabase.upload2"))
 end)
 
 function GetCourse(sharecode)
 	local url = domain:GetString() .. "/getcourse.php"
 		.. "?sharecode=" .. sharecode
-		.. "&map=" .. string.gsub(game.GetMap(), " ", "-")
+		.. "&map=" .. string.Replace(currentMap, " ", "-")
 		.. "&key=" .. apikey:GetString()
 
 	http.Fetch(url, function(body, length, headers, code)
 		if code == 200 then
-			print("Success! | Response: " .. code .. " | Length: " .. length)
+			print("Success! | Response: " .. code .. " | Length: " .. length .. "\nLoading course...")
-			print("Loading course...")
 
 			PrintTable(headers)
 
-			local dir = "beatrun/courses/" .. game.GetMap() .. "/"
+			local dir = "beatrun/courses/" .. currentMap .. "/"
 			file.CreateDir(dir)
 			local coursedata = util.Compress(body)
 
@@ -103,15 +110,15 @@ concommand.Add("Beatrun_LoadCode", function(ply, cmd, args, argstr)
 end)
 
 function UpdateCourse(course_code)
-	if Course_Name == "" or Course_ID == "" then return print("Can't upload in Freeplay") end
+	if Course_Name == "" or Course_ID == "" then return print(language.GetPhrase("beatrun.coursesdatabase.cantuploadfreeplay")) end
 
 	local url = domain:GetString() .. "/updatecourse.php"
-	local data = file.Open("beatrun/courses/" .. game.GetMap() .. "/" .. Course_ID .. ".txt", "rb", "DATA")
+	local data = file.Open("beatrun/courses/" .. currentMap .. "/" .. Course_ID .. ".txt", "rb", "DATA")
 	local filedata = util.Decompress(data:Read(data:Size()))
 
 	http.Post(url, {
 		key = apikey:GetString(),
-		map = string.Replace(game.GetMap(), " ", "-"),
+		map = string.Replace(currentMap, " ", "-"),
 		course_data = util.Base64Encode(filedata, true),
 		code = course_code
 	}, function(body, length, headers, code) -- onSuccess function
@@ -128,6 +135,7 @@ end
 concommand.Add("Beatrun_UpdateCode", function(ply, cmd, args, argstr)
 	QueuedFunction = UpdateCourse
 	QueuedArgs = args[1]
-	print("You're trying to update a course with this code: "..args[1]..", with a course on map "..game.GetMap().." and name "..Course_Name..".")
+
-	print("Write beatrun_confirm to continue, or beatrun_cancel to stop.")
+	print(language.GetPhrase("beatrun.coursesdatabase.update1"):format(QueuedArgs, Course_Name, currentMap))
-end)
+	print(language.GetPhrase("beatrun.coursesdatabase.upload2"))
+end)

beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua

@@ -1,4 +1,4 @@
-if not util.IsBinaryModuleInstalled("gdiscord", "GAME") then return end
+if not util.IsBinaryModuleInstalled("gdiscord") then return end
 
 require("gdiscord")
 
@@ -8,6 +8,10 @@ local refresh_time = 60
 local discord_start = discord_start or -1
 
 function DiscordUpdate()
+	local ply = LocalPlayer()
+
+	if not ply.GetLevel then return end
+
 	local rpc_data = {}
 
 	if game.SinglePlayer() then
@@ -34,14 +38,10 @@ function DiscordUpdate()
 		rpc_data["partyMax"] = 0
 	end
 
-	local level = LocalPlayer():GetLevel()
+	local level = ply:GetLevel()
 	local customname = hook.Run("BeatrunHUDCourse")
 	local course = customname and customname or Course_Name ~= "" and Course_Name or "Freeplay"
 
-	if course == nil then
-		course = "Freeplay"
-	end
-
 	rpc_data["details"] = "Level: " .. level .. " | Map: " .. game.GetMap()
 	rpc_data["startTimestamp"] = discord_start
 

beatrun/gamemodes/beatrun/gamemode/cl/Fall.lua

@@ -16,6 +16,7 @@ local vignettealpha = 0
 local function FallCheck()
 	local ply = LocalPlayer()
 	if not IsValid(ply) then return end
+
 	local speed = ply:GetVelocity().z
 
 	if not ply.FallStatic and speed <= -800 and ply:GetMoveType() ~= MOVETYPE_NOCLIP and ply:GetDive() == false then

beatrun/gamemodes/beatrun/gamemode/cl/HUD.lua

@@ -1,16 +1,17 @@
-local showtotalXP = CreateClientConVar("Beatrun_HUDXP", "1", true, false, "Show total XP near nickname", 0, 1)
+local showtotalXP = CreateClientConVar("Beatrun_HUDXP", "1", true, false, language.GetPhrase("beatrun.convars.hudxp"), 0, 1)
-local sway = CreateClientConVar("Beatrun_HUDSway", "1", true, false, "Display HUD swaying", 0, 1)
+local sway = CreateClientConVar("Beatrun_HUDSway", "1", true, false, language.GetPhrase("beatrun.convars.hudsway"), 0, 1)
-local dynamic = CreateClientConVar("Beatrun_HUDDynamic", "0", true, false, "Hide HUD when moving", 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, "Hides most of the XP HUD", 0, 2)
+local hidden = CreateClientConVar("Beatrun_HUDHidden", "0", true, false, language.GetPhrase("beatrun.convars.hudhidden"), 0, 2)
-local reticle = CreateClientConVar("Beatrun_HUDReticle", "1", true, false, "Display a reticle", 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"))
+CreateClientConVar("Beatrun_HUDFloatingXPColor", "255 255 255 255", true, true, language.GetPhrase("beatrun.convars.hudfloatxpcolor"))
+
 local packetloss = Material("vgui/packetloss.png")
 local lastloss = 0
 local MELogo = Material("vgui/MELogo.png", "mips smooth")
 
-CreateClientConVar("Beatrun_HUDTextColor", "255 255 255 255", true, true, "HUD Text Color\nDefault: 255 255 255 255")
-CreateClientConVar("Beatrun_HUDCornerColor", "20 20 20 100", true, true, "HUD Left Corner Color\nDefault: 20 20 20 100")
-CreateClientConVar("Beatrun_HUDFloatingXPColor", "255 255 255 255", true, true, "HUD Floating XP Color\nDefault: 255 255 255 255")
-
 local hide = {
 	CHudBattery = true,
 	CHudHealth = true,
@@ -129,12 +130,12 @@ local function BeatrunHUD()
 
 	surface.SetFont("DebugFixedSmall")
 
-	-- local vtext = (ply:SteamID() or "?") .. " | " .. VERSIONGLOBAL
+	local vtext = VERSIONGLOBAL
-	-- local tw, th = surface.GetTextSize(vtext)
+	local tw, _ = surface.GetTextSize(vtext)
-	-- surface.SetTextColor(255, 255, 255, 15)
+	surface.SetTextColor(255, 255, 255, 15)
-	-- surface.SetTextPos(scrw - tw, 0)
+	surface.SetTextPos(scrw - tw, 0)
-	-- surface.DrawText(vtext)
+	surface.DrawText(vtext)
-	-- surface.SetFont("BeatrunHUD")
+	surface.SetFont("BeatrunHUD")
 
 	local pl = ply:GetNW2Int("PLoss")
 	local CT = CurTime()
@@ -170,7 +171,7 @@ local function BeatrunHUD()
 
 	local coursename = nil
 	local customname = hook.Run("BeatrunHUDCourse")
-	coursename = customname and customname or Course_Name ~= "" and "Course: " .. Course_Name or "Freeplay"
+	coursename = customname and customname or Course_Name ~= "" and language.GetPhrase("beatrun.hud.course"):format(Course_Name) or "#beatrun.hud.freeplay"
 	-- local lastxp = ply.LastXP or 0
 	local nicktext = nil
 
@@ -223,7 +224,7 @@ local function BeatrunHUD()
 		surface.SetFont("BeatrunHUD")
 		surface.SetTextColor(text_color)
 		surface.SetTextPos(scrw * 0.015 + vp.z, scrh * 0.9 + vp.x)
-		surface.DrawText("Lv." .. ply:GetLevel())
+		surface.DrawText(language.GetPhrase("beatrun.hud.lvl"):format(ply:GetLevel()))
 
 		if tobool(LocalPlayer():GetInfo("Beatrun_PuristMode")) then
 			surface.SetDrawColor(230, 230, 230)
@@ -396,7 +397,7 @@ function BeatrunLeaderboard(forced)
 
 			if isinfection and pbtimenum == 0 and v:GetNW2Bool("Infected") then
 				surface.SetTextColor(infectorcolor)
-				surface.DrawText(" | Infector")
+				surface.DrawText(" | " .. language.GetPhrase("beatrun.hud.infector"))
 			else
 				surface.DrawText(" | " .. pbtime)
 			end
@@ -541,7 +542,7 @@ local function BeatrunReticle()
 
 	local wep = LocalPlayer():GetActiveWeapon()
 
-	if not IsValid(wep) or wep:GetClass() ~= "runnerhands" then return end
+	if not IsValid(wep) or LocalPlayer():notUsingRH() then return end
 
 	surface.SetDrawColor(255, 255, 255)
 	surface.SetMaterial(crosshair_standard)

beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua

@@ -16,11 +16,9 @@ local animtable = {
 fbanims = {
 	ladderexittoplefthand = true,
 	runfwdstart = true,
-	vaultkong = true,
 	walktostandleft = true,
 	wallrunverticalstart = true,
 	meleeair = true,
-	vaultonto = true,
 	fallinguncontrolled = true,
 	stand = true,
 	meslideend = true,
@@ -36,7 +34,6 @@ fbanims = {
 	hangheaveup = true,
 	jumpwrright = true,
 	meleeairhit = true,
-	vaultover = true,
 	jumpstill = true,
 	dodgejumpright = true,
 	jumpturnflyidle = true,
@@ -75,10 +72,8 @@ fbanims = {
 	diveslideidle = true,
 	wallrunright = true,
 	diveslideend = true,
-	vaultontohigh = true,
 	divestart = true,
 	hangfoldedheaveup = true,
-	vaultoverhigh = true,
 	ziplinestart = true,
 	dodgejumpleft = true,
 	evaderoll = true,
@@ -107,10 +102,20 @@ fbanims = {
 	ladderclimbuprighthandstill = true,
 	jumpidle = true,
 	jumpair = true,
+	vaultkong = true,
+	vaultonto = true,
+	vaultover = true,
+	vaultontohigh = true,
+	vaultoverhigh = true,
 	walkbalancefalloffright = true,
 	meleeairstill = true,
 	swingjumpoff = true,
-	snatchscar = true
+	snatchscar = true,
+	water_swimfwd = true,
+	water_swimright = true,
+	water_swimleft = true,
+	water_swimback = true,
+	water_float = true
 }
 
 local jumpanims = {
@@ -149,7 +154,6 @@ local events = {
 	fall = true,
 	ladderclimbleft = true,
 	jumpwallrun = true,
-	vaultonto = true,
 	ziplinestart = true,
 	hangstrafeleft = true,
 	hangstraferight = true,
@@ -165,7 +169,6 @@ local events = {
 	jumpslide = true,
 	swingpipeleft = true,
 	ladderenterhang = true,
-	vault = true,
 	disarmsniper = true,
 	jumpstill = true,
 	climb = true,
@@ -199,10 +202,13 @@ local events = {
 	ladderexittoprighthand = true,
 	hangend = true,
 	springboard = true,
+	vault = true,
 	vaultkong = true,
+	vaultonto = true,
+	vaultover = true,
+	vaultontohigh = true,
 	ladderclimbright = true,
-	meleeairstill = true,
+	meleeairstill = true
-	vaultontohigh = true
 }
 
 local eventslut = {
@@ -275,7 +281,10 @@ local armfollowanims = {
 	diestandlong = true,
 	diveslidestart = true,
 	vaultoverhigh = true,
-	walkfwd = true
+	walkfwd = true,
+	crouchstill = true,
+	crouchfwd = true,
+	crouchbwd = true
 }
 
 local armlock = {
@@ -321,10 +330,13 @@ local stillanims = {
 
 local arminterrupts = {
 	punchright = true,
-	doorbash = true,
-	punchmid = true,
 	punchleft = true,
-	jumpturnflypiecesign = true
+	punchmid = true,
+	doorbash = true,
+	jumpturnflypiecesign = true,
+	standhandwallright = true,
+	standhandwallleft = true,
+	standhandwallboth = true
 }
 
 local transitionanims = {
@@ -333,8 +345,6 @@ local transitionanims = {
 	ladderexittoplefthand = "runfwd",
 	walktostandleft = "stand",
 	fallinguncontrolled = "runfwd",
-	vaultoverhigh = "runfwd",
-	vaultonto = "runfwd",
 	hangstrafeleft = "hang",
 	ladderclimbhangstart = "ladderclimbuprighthandstill",
 	hanghardstart2 = "hang",
@@ -350,7 +360,6 @@ local transitionanims = {
 	hangheaveup = "runfwd",
 	dodgejumpleft = "stand",
 	walkbalancefalloffleft = "jumpair",
-	vaultover = "jumpair",
 	meleeairhit = "jumpair",
 	dodgejumpright = "stand",
 	meleeair = "jumpair",
@@ -368,7 +377,6 @@ local transitionanims = {
 	ladderclimbuplefthand = "ladderclimbuplefthandstill",
 	jumpturnfly = "jumpturnflyidle",
 	meleewrleft = "jumpair",
-	vaultkong = "runfwd",
 	meleeslide = "meslideloop",
 	stepuprightleg = "runfwd",
 	snatchsniper = "stand",
@@ -377,8 +385,17 @@ local transitionanims = {
 	wallrunverticalturn = "jumpslow",
 	ladderclimbuprighthand = "ladderclimbuprighthandstill",
 	meleeairstill = "jumpair",
+	vaultoverhigh = "runfwd",
+	vaultonto = "runfwd",
+	vaultover = "jumpair",
+	vaultkong = "runfwd",
 	vaultontohigh = "runfwd",
-	snatchscar = "stand"
+	snatchscar = "stand",
+	water_swimfwd = "runfwd",
+	water_swimright = "runfwd",
+	water_swimleft = "runfwd",
+	water_swimback = "runfwd",
+	water_float = "runfwd"
 }
 
 local nospinebend = {
@@ -412,7 +429,10 @@ local nospinebend = {
 	ladderclimbuprighthand = true,
 	ladderclimbhangstart = true,
 	vaultontohigh = true,
-	snatchscar = true
+	snatchscar = true,
+	crouchstill = true,
+	crouchfwd = true,
+	crouchbwd = true
 }
 
 local worldarm = {
@@ -442,8 +462,12 @@ local worldarm = {
 	ladderclimbuprighthand = true,
 	ladderclimbhangstart = true,
 	snatchscar = true,
-	jumpcoil = true,
+	jumpturnlandidle = true,
-	jumpturnlandidle = true
+	standhandwallright = true,
+	standhandwallleft = true,
+	standhandwallboth = true,
+	swing = true,
+	swingstraight = true
 }
 
 local ignorezarm = {
@@ -464,7 +488,8 @@ local nocyclereset = {
 
 local ignorebac = {
 	evaderoll = true,
-	meroll = true
+	meroll = true,
+	merollgun = true
 }
 
 local customspeed = {
@@ -489,7 +514,7 @@ local customarmoffset = {
 	meslidestart45 = Vector(2, 5, 5),
 	meslideloop45 = Vector(2, 5, 5),
 	meslideend = Vector(2, 5, 9.5),
-	meslideendprone = Vector(2, 5, 9.5),
+	meslideendprone = Vector(0, 0, 3),
 	meleeslide = Vector(2, 5, 9.5),
 	jumpturnfly = Vector(0, 2.5, 7.5),
 	jumpturnflyidle = Vector(0, 2.5, 7.5),
@@ -508,9 +533,9 @@ local customarmoffset = {
 	ladderexittoprighthand = Vector(5, 0, 0),
 	ladderclimbhangstart = Vector(-5, 0, 0),
 	ladderenterbottom = Vector(-7.5, 0, 0),
-	crouchstill = Vector(-4, 0, -5),
+	crouchstill = Vector(-4, 0, -2),
-	crouchfwd = Vector(-4, 0, -5),
+	crouchfwd = Vector(-4, 0, -2),
-	crouchbwd = Vector(0, 0, 0),
+	crouchbwd = Vector(-4, 0, -2),
 	walkfwd = Vector(10, 0, -10),
 	runbwd = Vector(0, 0, 3),
 	stand = Vector(10, 0, -10),
@@ -533,9 +558,9 @@ local customcamoffset = {
 	hangstrafeleft = Vector(-2.5, 0, 0),
 	hangstraferight = Vector(-2.5, 0, 0),
 	snatchscar = snatchscarcam1,
-	crouchstill = Vector(0, 0, 2.5),
+	crouchstill = Vector(2, 0, 2.5),
-	crouchfwd = Vector(0, 0, 2.5),
+	crouchfwd = Vector(2, 0, 2.5),
-	crouchbwd = Vector(0, 0, 2.5)
+	crouchbwd = Vector(2, 0, 2.5)
 }
 
 local transitionchecks = {
@@ -753,7 +778,14 @@ local transitionchecks = {
 
 fbfunctions = {
 	vaultontohigh = function(ply) return true end,
+	swing = function(ply)
+		CamIgnoreAng = false
+		BodyLimitY = 180
+	end,
 	swingstraight = function(ply)
+		CamIgnoreAng = false
+		BodyLimitY = 180
+
 		BodyAnim:SetPoseParameter("swing", (ply:GetSBOffset() / 45 - 1) * 100)
 	end,
 	ziplinestart = function(ply)
@@ -914,7 +946,6 @@ fbfunctions = {
 local defaultcamoffset = Vector()
 
 local playermodelbones = {"ValveBiped.Bip01_L_UpperArm", "ValveBiped.Bip01_R_UpperArm"}
-
 local fingers = {"ValveBiped.Bip01_L_Finger4", "ValveBiped.Bip01_L_Finger41", "ValveBiped.Bip01_L_Finger3", "ValveBiped.Bip01_L_Finger31", "ValveBiped.Bip01_L_Finger2", "ValveBiped.Bip01_L_Finger21", "ValveBiped.Bip01_L_Finger1", "ValveBiped.Bip01_L_Finger11", "ValveBiped.Bip01_R_Finger4", "ValveBiped.Bip01_R_Finger41", "ValveBiped.Bip01_R_Finger3", "ValveBiped.Bip01_R_Finger31", "ValveBiped.Bip01_R_Finger2", "ValveBiped.Bip01_R_Finger21", "ValveBiped.Bip01_R_Finger1", "ValveBiped.Bip01_R_Finger11"}
 
 local fingerscustom = {
@@ -1011,7 +1042,6 @@ eventsounds = {
 }
 
 local CharaName = "Faith"
-local CharaLen = #CharaName
 
 local function BodyEventSounds(anim)
 	local tbl = eventsounds[anim]
@@ -1022,7 +1052,7 @@ local function BodyEventSounds(anim)
 		for k, v in pairs(tbl) do
 			local func = nil
 
-			if v:Left(CharaLen) == CharaName then
+			if v:Left(#CharaName) == CharaName then
 				func = ply.FaithVO
 			else
 				func = ply.EmitSound
@@ -1212,7 +1242,7 @@ local function JumpArmDraw(a, b, c)
 
 		local activewep = ply:GetActiveWeapon()
 
-		if IsValid(activewep) and activewep:GetClass() == "runnerhands" then
+		if ply:UsingRH() then
 			if not worldarm[BodyAnimString] then
 				cam.Start3D(pos, ang)
 					cam.IgnoreZ(ignorezarm[BodyAnimString] or false)
@@ -1372,7 +1402,7 @@ function ArmInterrupt(anim)
 		local arm = CreateBodyAnimArmCopy()
 
 		if IsValid(arm) then
-			for k, v in ipairs(fingers) do
+			for _, v in ipairs(fingers) do
 				local b = BodyAnimArmCopy:LookupBone(v)
 
 				if b then
@@ -1380,7 +1410,7 @@ function ArmInterrupt(anim)
 				end
 			end
 
-			for k, v in pairs(fingerscustom) do
+			for k, _ in pairs(fingerscustom) do
 				local b = BodyAnimArmCopy:LookupBone(k)
 
 				if b then
@@ -1388,6 +1418,22 @@ function ArmInterrupt(anim)
 				end
 			end
 
+			--[[ TODO: make work good
+			if string.match(anim, "standhandwall") then
+				local ply = LocalPlayer()
+				local trace = util.QuickTrace(ply:GetShootPos(), ply:GetAimVector() * 30, ply)
+				local x = trace.Normal.x < 0.6 and trace.Normal.x or trace.Normal.y
+				local y = trace.Normal.y > -0.8 and trace.Normal.y or -trace.Normal.x
+
+				local newAng = Angle(x * (5 * trace.Fraction * x), 0, x * (10 * trace.Fraction * y))
+
+				ply:ChatPrint("Fraction: " .. tostring(trace.Fraction))
+				ply:ChatPrint("Normal: " .. tostring(trace.Normal))
+
+				arm:SetAngles(newAng)
+			end
+			--]]
+
 			arm:SetSequence(anim)
 			arm:SetCycle(0)
 		end
@@ -1623,6 +1669,20 @@ local function JumpThink()
 				BodyAnim:SetSequence(transitionanims[BodyAnimString])
 			end
 
+			if ply:WaterLevel() >= 2 and not ply:Crouching() and not ply:OnGround() and ply:GetMoveType() ~= MOVETYPE_NOCLIP then
+				BodyAnim:SetSequence(BodyAnim:LookupSequence("water_float"))
+
+				if ply:KeyDown(IN_MOVELEFT) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimleft"))
+				elseif ply:KeyDown(IN_MOVERIGHT) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimright"))
+				elseif ply:KeyDown(IN_FORWARD) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimfwd"))
+				elseif ply:KeyDown(IN_BACK) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimback"))
+				end
+			end
+
 			if BodyAnimString == "wallrunverticalstart" or BodyAnimString == "wallrunvertical" then
 				ang = ply.WallrunOrigAng or ang
 				BodyAnimSpeed = 1.2 * math.Clamp((LocalPlayer():GetWallrunTime() - CurTime()) / 1.2, 0.5, 1)
@@ -1728,4 +1788,4 @@ local function JumpThink()
 	end
 end
 
-hook.Add("Think", "JumpThink", JumpThink)
+hook.Add("Think", "JumpThink", JumpThink)

beatrun/gamemodes/beatrun/gamemode/cl/Menu_Course.lua

@@ -25,12 +25,12 @@ local function buildmodebutton()
 	LocalPlayer():ConCommand("buildmode")
 end
 
-AEUI:AddText(coursepanel, "Time Trials - " .. game.GetMap(), "AEUIVeryLarge", 20, 30)
+AEUI:AddText(coursepanel, language.GetPhrase("beatrun.coursemenu.trials"):format(game.GetMap()), "AEUIVeryLarge", 20, 30)
 
-local buildmodebutton = AEUI:AddButton(coursepanel, "Build Mode Toggle", buildmodebutton, "AEUILarge", coursepanel.w - 400, coursepanel.h - 50)
+local buildmodebutton = AEUI:AddButton(coursepanel, "#beatrun.coursemenu.buildmode", buildmodebutton, "AEUILarge", coursepanel.w - 400, coursepanel.h - 50)
 buildmodebutton.greyed = sacheck
 
-local stopbutton = AEUI:AddButton(coursepanel, "Return to Freeplay", stopbutton, "AEUILarge", coursepanel.w - 750, coursepanel.h - 50)
+local stopbutton = AEUI:AddButton(coursepanel, "#beatrun.coursemenu.freeplay", stopbutton, "AEUILarge", coursepanel.w - 750, coursepanel.h - 50)
 stopbutton.greyed = sacheck
 
 local courselist = {

beatrun/gamemodes/beatrun/gamemode/cl/Nametags.lua

@@ -1,4 +1,4 @@
-local NametagsEnable = CreateClientConVar("Beatrun_Nametags", "1", true, false, "Toggles nametags above players", 0, 1)
+local NametagsEnable = CreateClientConVar("Beatrun_Nametags", "1", true, false, language.GetPhrase("beatrun.convars.nametags"), 0, 1)
 
 local enemy = Color(255, 0, 0)
 

beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua

@@ -1,4 +1,4 @@
-if not util.IsBinaryModuleInstalled("steamrichpresencer", "GAME") then return end
+if not util.IsBinaryModuleInstalled("steamrichpresencer") then return end
 
 require("steamrichpresencer")
 
@@ -7,17 +7,13 @@ local refresh_time = 60
 
 local function UpdateRichPresence()
 	local ply = LocalPlayer()
+
 	if not ply.GetLevel then return end
 
 	local map = game.GetMap()
-	local level = LocalPlayer():GetLevel()
+	local level = ply:GetLevel()
-	local course = nil
 	local customname = hook.Run("BeatrunHUDCourse")
-	course = customname and customname or Course_Name ~= "" and Course_Name or "Freeplay"
+	local course = customname and customname or Course_Name ~= "" and Course_Name or "Freeplay"
-
-	if course == nil then
-		course = "Freeplay"
-	end
 
 	local updatedtext = "Beatrun Lv. " .. level .. " (" .. map .. ") | " .. course
 

beatrun/gamemodes/beatrun/gamemode/cl/ToolMenuSettings.lua

@@ -5,33 +5,33 @@ local function ToggleGamemode(gm)
 end
 
 hook.Add("AddToolMenuCategories", "Beatrun_Category", function()
-	spawnmenu.AddToolCategory("Beatrun", "Client", "Client")
+	spawnmenu.AddToolCategory("Beatrun", "Client", language.GetPhrase("beatrun.toolsmenu.client"))
-	spawnmenu.AddToolCategory("Beatrun", "Server", "Server")
+	spawnmenu.AddToolCategory("Beatrun", "Server", language.GetPhrase("beatrun.toolsmenu.server"))
 end)
 
 hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
-	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_courses", "Courses", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_courses", language.GetPhrase("beatrun.toolsmenu.courses.name"), "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("Courses Setttings")
+		panel:SetName("#beatrun.toolsmenu.courses.desc")
 
-		panel:CheckBox("Fast Start", "Beatrun_FastStart")
+		panel:CheckBox("#beatrun.toolsmenu.courses.faststart", "Beatrun_FastStart")
-		panel:ControlHelp("Faster countdown in courses")
+		panel:ControlHelp("#beatrun.toolsmenu.courses.faststartdesc")
 
-		panel:CheckBox("Save at Checkpoint", "Beatrun_CPSave")
+		panel:CheckBox("#beatrun.toolsmenu.courses.checkpointsave", "Beatrun_CPSave")
-		panel:ControlHelp("Respawn at last hit checkpoint in courses")
+		panel:ControlHelp("#beatrun.toolsmenu.courses.checkpointsavedesc")
 
 		local divider = vgui.Create("DHorizontalDivider")
 		panel:AddItem(divider)
 
-		panel:TextEntry("Courses server", "Beatrun_Domain")
+		panel:TextEntry("#beatrun.toolsmenu.courses.database", "Beatrun_Domain")
-		panel:ControlHelp("Database domain\nDefault: courses.beatrun.ru")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.courses.databasedesc"))
 
 		local apiKeyButton = vgui.Create("DButton", panel)
-		apiKeyButton:SetText("Change API Key")
+		apiKeyButton:SetText("#beatrun.toolsmenu.courses.changeapikey")
 		apiKeyButton:SetSize(0, 20)
 		apiKeyButton.DoClick = function()
 			local frame = vgui.Create("DFrame")
-			frame:SetTitle("Enter your API Key")
+			frame:SetTitle("#beatrun.toolsmenu.courses.enterapikey")
 			frame:SetSize(300, 100)
 			frame:SetDeleteOnClose(true)
 			frame:Center()
@@ -41,11 +41,13 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 			TextEntry:Dock(TOP)
 
 			local okButton = vgui.Create("DButton", frame)
-			okButton:SetText("OK")
+			okButton:SetText("#beatrun.misc.ok")
 			okButton:SetPos(25, 60)
 			okButton:SetSize(250, 30)
 			okButton.DoClick = function()
-				RunConsoleCommand("Beatrun_Apikey", TextEntry:GetValue())
+				local key = string.Replace(TextEntry:GetValue(), " ", "")
+
+				RunConsoleCommand("Beatrun_Apikey", key)
 				frame:Close()
 			end
 		end
@@ -55,11 +57,11 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		panel:AddItem(divider)
 
 		local saveCourseButton = vgui.Create("DButton", panel)
-		saveCourseButton:SetText("Save current course to a file")
+		saveCourseButton:SetText("#beatrun.toolsmenu.courses.savecourse")
 		saveCourseButton:SetSize(0, 20)
 		saveCourseButton.DoClick = function()
 			local frame = vgui.Create("DFrame")
-			frame:SetTitle("Enter a name for your course")
+			frame:SetTitle("#beatrun.toolsmenu.courses.namesavecourse")
 			frame:SetSize(300, 100)
 			frame:SetDeleteOnClose(true)
 			frame:Center()
@@ -69,22 +71,24 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 			TextEntry:Dock(TOP)
 
 			local okButton = vgui.Create("DButton", frame)
-			okButton:SetText("OK")
+			okButton:SetText("#beatrun.misc.ok")
 			okButton:SetPos(25, 60)
 			okButton:SetSize(250, 30)
 			okButton.DoClick = function()
-				RunConsoleCommand("Beatrun_SaveCourse", TextEntry:GetValue())
+				local name = string.Replace(TextEntry:GetValue(), " ", "_")
+
+				RunConsoleCommand("Beatrun_SaveCourse", name)
 				frame:Close()
 			end
 		end
 		panel:AddItem(saveCourseButton)
 
-		local loadCodeButton = vgui.Create("DButton", panel)
+		local loadCourseButton = vgui.Create("DButton", panel)
-		loadCodeButton:SetText("Load a course from the database")
+		loadCourseButton:SetText("#beatrun.toolsmenu.courses.loadcourse")
-		loadCodeButton:SetSize(0, 20)
+		loadCourseButton:SetSize(0, 20)
-		loadCodeButton.DoClick = function()
+		loadCourseButton.DoClick = function()
 			local frame = vgui.Create("DFrame")
-			frame:SetTitle("Enter course code")
+			frame:SetTitle("#beatrun.toolsmenu.courses.enterloadcourse")
 			frame:SetSize(300, 100)
 			frame:SetDeleteOnClose(true)
 			frame:Center()
@@ -94,31 +98,33 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 			TextEntry:Dock(TOP)
 
 			local okButton = vgui.Create("DButton", frame)
-			okButton:SetText("OK")
+			okButton:SetText("#beatrun.misc.ok")
 			okButton:SetPos(25, 60)
 			okButton:SetSize(250, 30)
 			okButton.DoClick = function()
-				RunConsoleCommand("Beatrun_LoadCode", TextEntry:GetValue())
+				local code = string.Replace(TextEntry:GetValue(), " ", "")
+
+				RunConsoleCommand("Beatrun_LoadCode", code)
 				frame:Close()
 			end
 		end
-		panel:AddItem(loadCodeButton)
+		panel:AddItem(loadCourseButton)
 
 		local uploadCourseButton = vgui.Create("DButton", panel)
-		uploadCourseButton:SetText("Upload current course to the database")
+		uploadCourseButton:SetText("#beatrun.toolsmenu.courses.uploadcourse")
 		uploadCourseButton:SetSize(0, 20)
 		uploadCourseButton.DoClick = function()
 			RunConsoleCommand("Beatrun_UploadCourse")
-			notification.AddLegacy("Open your console for the code!", NOTIFY_HINT, 5)
+			notification.AddLegacy("#beatrun.misc.checkconsole", NOTIFY_HINT, 5)
 		end
 		panel:AddItem(uploadCourseButton)
 
-		local updateCodeButton = vgui.Create("DButton", panel)
+		local updateCourseButton = vgui.Create("DButton", panel)
-		updateCodeButton:SetText("Update a course on the database")
+		updateCourseButton:SetText("#beatrun.toolsmenu.courses.updatecourse")
-		updateCodeButton:SetSize(0, 20)
+		updateCourseButton:SetSize(0, 20)
-		updateCodeButton.DoClick = function()
+		updateCourseButton.DoClick = function()
 			local frame = vgui.Create("DFrame")
-			frame:SetTitle("Enter course code")
+			frame:SetTitle("#beatrun.toolsmenu.courses.enterloadcourse")
 			frame:SetSize(300, 100)
 			frame:SetDeleteOnClose(true)
 			frame:Center()
@@ -128,53 +134,51 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 			TextEntry:Dock(TOP)
 
 			local okButton = vgui.Create("DButton", frame)
-			okButton:SetText("OK")
+			okButton:SetText("#beatrun.misc.ok")
 			okButton:SetPos(25, 60)
 			okButton:SetSize(250, 30)
 			okButton.DoClick = function()
 				RunConsoleCommand("Beatrun_UpdateCode", TextEntry:GetValue())
-				notification.AddLegacy("Open your console for server's response!", NOTIFY_HINT, 5)
+				notification.AddLegacy("#beatrun.misc.checkconsole", NOTIFY_HINT, 5)
 				frame:Close()
 			end
 		end
-		panel:AddItem(updateCodeButton)
+		panel:AddItem(updateCourseButton)
+		panel:Help("#beatrun.toolsmenu.courses.updatecoursehelp")
 	end)
 
-	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_hud", "HUD", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_hud", "#beatrun.toolsmenu.hud.name", "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("HUD Setttings")
+		panel:SetName("#beatrun.toolsmenu.hud.desc")
 
-		panel:CheckBox("Dynamic HUD", "Beatrun_HUDDynamic")
+		panel:CheckBox("#beatrun.toolsmenu.hud.dynamic", "Beatrun_HUDDynamic")
-		panel:ControlHelp("Hides HUD when moving")
+		panel:ControlHelp("#beatrun.toolsmenu.hud.dynamicdesc")
 
-		panel:CheckBox("HUD Sway", "Beatrun_HUDSway")
+		panel:CheckBox("#beatrun.toolsmenu.hud.sway", "Beatrun_HUDSway")
-		panel:ControlHelp("Toggles HUD swaying")
+		panel:ControlHelp("#beatrun.toolsmenu.hud.swaydesc")
 
-		panel:CheckBox("Dot", "Beatrun_HUDReticle")
+		panel:CheckBox("#beatrun.toolsmenu.hud.reticle", "Beatrun_HUDReticle")
-		panel:ControlHelp("Shows a dot in the center of the screen")
+		panel:ControlHelp("#beatrun.toolsmenu.hud.reticledesc")
 
-		panel:CheckBox("Nametags", "Beatrun_Nametags")
+		panel:CheckBox("#beatrun.toolsmenu.hud.nametags", "Beatrun_Nametags")
-		panel:ControlHelp("Toggles nametags above players")
+		panel:ControlHelp("#beatrun.toolsmenu.hud.nametagsdesc")
 
-		panel:CheckBox("Floating XP", "Beatrun_HUDXP")
+		panel:CheckBox("#beatrun.toolsmenu.hud.hudxp", "Beatrun_HUDXP")
-		panel:ControlHelp("Show total XP near your nickname")
+		panel:ControlHelp("#beatrun.toolsmenu.hud.hudxpdesc")
 
-		panel:CheckBox("Lower Viewmodel", "Beatrun_MinimalVM")
+		panel:CheckBox("#beatrun.toolsmenu.hud.wind", "Beatrun_Wind")
-		panel:ControlHelp("Lowers the running viewmodel")
+		panel:ControlHelp("#beatrun.toolsmenu.hud.winddesc")
 
-		panel:CheckBox("Wind", "Beatrun_Wind")
+		panel:NumSlider("#beatrun.toolsmenu.hud.fov", "Beatrun_FOV", 90, 120, 0)
-		panel:ControlHelp("Wind noises when running")
+		panel:Help("#beatrun.toolsmenu.hud.fovdesc")
 
-		panel:NumSlider("FOV", "Beatrun_FOV", 90, 120, 0)
+		panel:NumSlider("#beatrun.toolsmenu.hud.hidden", "Beatrun_HUDHidden", 0, 2, 0)
-		panel:ControlHelp("You need to respawn after changing the FOV!")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.hud.hiddendesc"))
-
-		panel:NumSlider("Hide HUD", "Beatrun_HUDHidden", 0, 2, 0)
-		panel:ControlHelp("0 - Shown\n1 - Gamemode only\n2 - Hidden")
 
 		local divider = vgui.Create("DHorizontalDivider")
 		panel:AddItem(divider)
 
-		panel:Help("HUD Text Color")
+		panel:Help("#beatrun.toolsmenu.hud.textcolor")
 		local HudTextColor = vgui.Create("DColorMixer", panel)
 		HudTextColor:Dock(FILL)
 		HudTextColor:SetPalette(true)
@@ -186,7 +190,7 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		end
 		panel:AddItem(HudTextColor)
 
-		panel:Help("HUD Corners Color")
+		panel:Help("#beatrun.toolsmenu.hud.cornercolor")
 		local HudCornerColor = vgui.Create("DColorMixer", panel)
 		HudCornerColor:Dock(FILL)
 		HudCornerColor:SetPalette(true)
@@ -198,7 +202,7 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		end
 		panel:AddItem(HudCornerColor)
 
-		panel:Help("HUD Floating XP Color")
+		panel:Help("#beatrun.toolsmenu.hud.floatxpcolor")
 		local HudFXPColor = vgui.Create("DColorMixer", panel)
 		HudFXPColor:Dock(FILL)
 		HudFXPColor:SetPalette(true)
@@ -211,100 +215,115 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		panel:AddItem(HudFXPColor)
 	end)
 
-	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_viewbob", "Viewbob", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_viewbob", "#beatrun.toolsmenu.viewbob.name", "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("Viewbob Settings")
+		panel:SetName("#beatrun.toolsmenu.viewbob.desc")
 
-		panel:CheckBox("Viewbob Stabilization", "Beatrun_ViewbobStabilized")
+		panel:CheckBox("#beatrun.toolsmenu.viewbob.stabilization", "Beatrun_ViewbobStabilized")
-		panel:ControlHelp("Turn on to reduce motion sickness by making viewbobbing keep the player's look position centered")
+		panel:ControlHelp("#beatrun.toolsmenu.viewbob.stabilizationdesc")
-		panel:NumSlider("Viewbob Intensity", "Beatrun_ViewbobIntensity", -100, 100, 0)
+
+		panel:NumSlider("#beatrun.toolsmenu.viewbob.intensity", "Beatrun_ViewbobIntensity", -100, 100, 0)
 	end)
 
-	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_gameplay", "Gameplay", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Client", "beatrun_gameplay", "#beatrun.toolsmenu.gameplay.name", "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("Gameplay Settings")
+		panel:SetName("#beatrun.toolsmenu.gameplay.desc")
 
-		panel:CheckBox("Quickturn", "Beatrun_QuickturnGround")
+		panel:CheckBox("#beatrun.toolsmenu.gameplay.quickturnground", "Beatrun_QuickturnGround")
-		panel:ControlHelp("Enables quickturning with secondary attack while on the ground")
+		panel:ControlHelp("#beatrun.toolsmenu.gameplay.quickturngrounddesc")
 
-		panel:CheckBox("Purist Mode", "Beatrun_PuristMode")
+		panel:CheckBox("#beatrun.toolsmenu.gameplay.quickturnhandsonly", "Beatrun_QuickturnHandsOnly")
-		panel:ControlHelp("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.\nDisabled = No restrictions\nEnabled = Reduced move speed in the air")
+		panel:ControlHelp("#beatrun.toolsmenu.gameplay.quickturnhandsonlydesc")
 
-		panel:CheckBox("Disable Grapple Ability", "Beatrun_DisableGrapple")
+		panel:CheckBox("#beatrun.toolsmenu.gameplay.puristmode", "Beatrun_PuristMode")
-		panel:ControlHelp("Disables grapple ability")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.gameplay.puristmodedesc"))
+
+		panel:CheckBox("#beatrun.toolsmenu.gameplay.disablegrapple", "Beatrun_DisableGrapple")
+		panel:ControlHelp("#beatrun.toolsmenu.gameplay.disablegrappledesc")
 	end)
 
-	spawnmenu.AddToolMenuOption("Beatrun", "Server", "beatrun_main", "Main", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Server", "beatrun_misc", "#beatrun.toolsmenu.misc.name", "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("Misc Settings")
+		panel:SetName("#beatrun.toolsmenu.misc.desc")
 
-		panel:CheckBox("Prop Spawning", "Beatrun_AllowPropSpawn")
+		panel:CheckBox("#beatrun.toolsmenu.misc.propspawn", "Beatrun_AllowPropSpawn")
-		panel:ControlHelp("Allows players without admin rights to spawn props, entities and weapons")
+		panel:ControlHelp("#beatrun.toolsmenu.misc.propspawndesc")
 
-		panel:CheckBox("Overdrive in Multiplayer", "Beatrun_AllowOverdriveInMultiplayer")
+		panel:CheckBox("#beatrun.toolsmenu.misc.overdrivemp", "Beatrun_AllowOverdriveInMultiplayer")
-		panel:ControlHelp("Allows Overdrive usage on the server\nDoesn't affect singleplayer")
+		panel:ControlHelp("#beatrun.toolsmenu.misc.overdrivempdesc")
 	end)
 
-	spawnmenu.AddToolMenuOption("Beatrun", "Server", "beatrun_moves", "Moves", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Server", "beatrun_moves", "#beatrun.toolsmenu.moves.name", "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("Moves Settings")
+		panel:SetName("#beatrun.toolsmenu.moves.desc")
-		panel:Help("You Can Dive with Ctrl + RMB While Midair!\nOverdrive Toggles with E + LMB.")
+		panel:Help(language.GetPhrase("beatrun.toolsmenu.moves.help"))
 
-		panel:CheckBox("Force Purist Mode", "Beatrun_PuristModeForce")
+		panel:NumSlider("#beatrun.toolsmenu.moves.speedlimit", "Beatrun_SpeedLimit", 325, 1000, 0)
-		panel:ControlHelp("Forces Purist Mode for all players")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.speedlimitdesc"))
 
-		panel:CheckBox("\"Realistic\" wallrunning", "Beatrun_PuristWallrun")
+		panel:CheckBox("#beatrun.toolsmenu.moves.forcepuristmode", "Beatrun_PuristModeForce")
-		panel:ControlHelp("You don't lose speed when starting wallrunning when disabled")
+		panel:ControlHelp("#beatrun.toolsmenu.moves.forcepuristmodedesc")
+
+		panel:CheckBox("#beatrun.toolsmenu.moves.realisticwallrunning", "Beatrun_PuristWallrun")
+		panel:ControlHelp("#beatrun.toolsmenu.moves.realisticwallrunningdesc")
 
 		local divider = vgui.Create("DHorizontalDivider")
 		panel:AddItem(divider)
 
-		panel:CheckBox("Kick-Glitch", "Beatrun_KickGlitch")
+		panel:CheckBox("#beatrun.toolsmenu.moves.kickglitch", "Beatrun_KickGlitch")
-		panel:ControlHelp("Toggles Kick-Glitch Move\nLMB when Wallrunning and Then Jumping Right After")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.kickglitchdesc"))
 
-		panel:CheckBox("Kick-Glitch Version", "Beatrun_OldKickGlitch")
+		panel:CheckBox("#beatrun.toolsmenu.moves.kickglitchversion", "Beatrun_OldKickGlitch")
-		panel:ControlHelp("Enabled - Old Kick-Glitch\nDisabled - New Kick-Glitch\nNew version uses mechanic from Mirror's Edge that spawns a small platform under a player")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.kickglitchversiondesc"))
 
-		panel:CheckBox("Quake Jump", "Beatrun_QuakeJump")
+		panel:CheckBox("#beatrun.toolsmenu.moves.quakejump", "Beatrun_QuakeJump")
-		panel:ControlHelp("Toggles Quake Jump Move\nPress RMB Right After Side Step")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.quakejumpdesc"))
 
-		panel:CheckBox("Side Step", "Beatrun_SideStep")
+		panel:CheckBox("#beatrun.toolsmenu.moves.sidestep", "Beatrun_SideStep")
-		panel:ControlHelp("Toggles Side Step Move\nA/D + RMB")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.sidestepdesc"))
 
-		panel:CheckBox("Disarm", "Beatrun_Disarm")
+		panel:CheckBox("#beatrun.toolsmenu.moves.disarm", "Beatrun_Disarm")
-		panel:ControlHelp("Toggles Ability to Disarm NPC\nInteract with NPC")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.disarmdesc"))
 
 		local divider = vgui.Create("DHorizontalDivider")
 		panel:AddItem(divider)
 
-		panel:Help("Dive Settings")
+		panel:Help("#beatrun.toolsmenu.moves.divesettings")
 
-		panel:CheckBox("Totsugeki", "Beatrun_Totsugeki")
+		panel:CheckBox("#beatrun.toolsmenu.moves.totsugeki", "Beatrun_Totsugeki")
-		panel:ControlHelp("Toggles Totsugeki Move\nDive After Quake Jump")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.totsugekidesc"))
 
-		panel:CheckBox("Totsugeki Spam", "Beatrun_TotsugekiSpam")
+		panel:CheckBox("#beatrun.toolsmenu.moves.totsugekispam", "Beatrun_TotsugekiSpam")
-		panel:ControlHelp("Toggles Ability to Spam Totsugeki")
+		panel:ControlHelp("#beatrun.toolsmenu.moves.totsugekispamdesc")
 
-		panel:CheckBox("Totsugeki Heading", "Beatrun_TotsugekiHeading")
+		panel:CheckBox("#beatrun.toolsmenu.moves.totsugekiheading", "Beatrun_TotsugekiHeading")
-		panel:ControlHelp("Allows to Totsugeki on X axis (up/down)")
+		panel:ControlHelp("#beatrun.toolsmenu.moves.totsugekiheadingdesc")
 
-		panel:CheckBox("Totsugeki Direction", "Beatrun_TotsugekiDir")
+		panel:CheckBox("#beatrun.toolsmenu.moves.totsugekidirection", "Beatrun_TotsugekiDir")
-		panel:ControlHelp("Allows to Totsugeki into Another Direction\nCombined with Spam and Heading Allows You to Fly =)")
+		panel:ControlHelp(language.GetPhrase("beatrun.toolsmenu.moves.totsugekidirectiondesc"))
 	end)
 
-	spawnmenu.AddToolMenuOption("Beatrun", "Server", "beatrun_gamemodes", "Gamemodes", "", "", function(panel)
+	spawnmenu.AddToolMenuOption("Beatrun", "Server", "beatrun_gamemodes", "#beatrun.toolsmenu.gamemodes.name", "", "", function(panel)
 		panel:ClearControls()
-		panel:SetName("Gamemodes Settings")
+		panel:SetName("#beatrun.toolsmenu.gamemodes.desc")
+
+		panel:NumSlider("#beatrun.toolsmenu.gamemodes.infectionstarttime", "Beatrun_InfectionStartTime", 5, 20, 0)
+		panel:Help("#beatrun.toolsmenu.gamemodes.infectiontime")
+
+		panel:NumSlider("#beatrun.toolsmenu.gamemodes.infectiongametime", "Beatrun_InfectionGameTime", 30, 600, 0)
+		panel:Help("#beatrun.toolsmenu.gamemodes.infectiontime")
 
 		local InfectionButton = vgui.Create("DButton", panel)
-		InfectionButton:SetText("Toggle Infection Gamemode")
+		InfectionButton:SetText("#beatrun.toolsmenu.gamemodes.infection")
 		InfectionButton:SetSize(0, 20)
 		InfectionButton.DoClick = function()
 			if GetGlobalBool("GM_DEATHMATCH") or GetGlobalBool("GM_DATATHEFT") then
-				InfectionButton:SetText("Another gamemode is running!")
+				InfectionButton:SetText("#beatrun.toolsmenu.gamemodes.error")
+
 				timer.Simple(2, function()
-					InfectionButton:SetText("Toggle Infection Gamemode")
+					InfectionButton:SetText("#beatrun.toolsmenu.gamemodes.infection")
 				end)
+
 				return
 			end
 
@@ -313,14 +332,16 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		panel:AddItem(InfectionButton)
 
 		local DatatheftButton = vgui.Create("DButton", panel)
-		DatatheftButton:SetText("Toggle Data Theft Gamemode")
+		DatatheftButton:SetText("#beatrun.toolsmenu.gamemodes.datatheft")
 		DatatheftButton:SetSize(0, 20)
 		DatatheftButton.DoClick = function()
 			if GetGlobalBool("GM_INFECTION") or GetGlobalBool("GM_DEATHMATCH") then
-				DatatheftButton:SetText("Another gamemode is running!")
+				DatatheftButton:SetText("#beatrun.toolsmenu.gamemodes.error")
+
 				timer.Simple(2, function()
-					DatatheftButton:SetText("Toggle Data Theft Gamemode")
+					DatatheftButton:SetText("#beatrun.toolsmenu.gamemodes.datatheft")
 				end)
+
 				return
 			end
 
@@ -329,14 +350,16 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		panel:AddItem(DatatheftButton)
 
 		local DeathmatchButton = vgui.Create("DButton", panel)
-		DeathmatchButton:SetText("Toggle Deathmatch Gamemode")
+		DeathmatchButton:SetText("#beatrun.toolsmenu.gamemodes.deathmatch")
 		DeathmatchButton:SetSize(0, 20)
 		DeathmatchButton.DoClick = function()
 			if GetGlobalBool("GM_INFECTION") or GetGlobalBool("GM_DATATHEFT") then
-				DeathmatchButton:SetText("Another gamemode is running!")
+				DeathmatchButton:SetText("#beatrun.toolsmenu.gamemodes.error")
+
 				timer.Simple(2, function()
-					DeathmatchButton:SetText("Toggle Deathmatch Gamemode")
+					DeathmatchButton:SetText("#beatrun.toolsmenu.gamemodes.deathmatch")
 				end)
+
 				return
 			end
 
@@ -372,4 +395,4 @@ hook.Add("PopulateToolMenu", "Beatrun_ToolMenu", function()
 		-- end
 		-- panel:AddItem(LoadoutMenuButton)
 	end)
-end)
+end)

beatrun/gamemodes/beatrun/gamemode/cl/Viewpunch.lua

@@ -2,8 +2,8 @@ local meta = FindMetaTable("Player")
 local metavec = FindMetaTable("Vector")
 local PUNCH_DAMPING = 9
 local PUNCH_SPRING_CONSTANT = 120
-local viewbob_intensity = CreateClientConVar("Beatrun_ViewbobIntensity", "20", true, true, "Viewbob Intensity", -100, 100)
+local viewbob_intensity = CreateClientConVar("Beatrun_ViewbobIntensity", "20", true, true, language.GetPhrase("beatrun.convars.viewbob"), -100, 100)
-local viewbob_stabilized = CreateClientConVar("Beatrun_ViewbobStabilized", "0", true, true, "Turn on to reduce motion sickness by making viewbobbing keep the player's look position centered", 0, 1)
+local viewbob_stabilized = CreateClientConVar("Beatrun_ViewbobStabilized", "0", true, true, language.GetPhrase("beatrun.convars.viewbobstabilization"), 0, 1)
 
 local function lensqr(ang)
 	return ang[1] ^ 2 + ang[2] ^ 2 + ang[3] ^ 2

beatrun/gamemodes/beatrun/gamemode/cl/Watermark.lua

@@ -24,4 +24,4 @@ hook.Add("PostRender", "Watermark", function()
 		surface.DrawText(LocalPlayer():Nick())
 	cam.End2D()
 end)
-]]
+--]]

beatrun/gamemodes/beatrun/gamemode/cl/Whitescale.lua

@@ -72,4 +72,4 @@ local function ToggleWhitescale()
 	end
 end
 
-concommand.Add("ToggleWhitescale", ToggleWhitescale)
+concommand.Add("Beatrun_ToggleWhitescale", ToggleWhitescale)

beatrun/gamemodes/beatrun/gamemode/cl/XP.lua

@@ -1,5 +1,4 @@
 local meta = FindMetaTable("Player")
--- local XP_max = 2000000
 local XP_ratiocache = nil
 local parkourevent_lastpos = Vector()
 

beatrun/gamemodes/beatrun/gamemode/cl/off/blind.lua

@@ -610,9 +610,8 @@ function ToggleBlindness(toggle)
 	if blinded then
 		local ply = LocalPlayer()
 		local activewep = ply:GetActiveWeapon()
-		local usingrh = IsValid(activewep) and activewep:GetClass() == "runnerhands"
 
-		if usingrh and activewep.RunWind1 then
+		if ply:UsingRH() and activewep.RunWind1 then
 			activewep.RunWind1:Stop()
 			activewep.RunWind2:Stop()
 		end

beatrun/gamemodes/beatrun/gamemode/cl_init.lua

@@ -1,5 +1,5 @@
 include("shared.lua")
 
-for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/cl/*.lua", "GAME", "nameasc")) do
+for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/cl/*.lua", "GAME")) do
 	include("cl/" .. v)
 end

beatrun/gamemodes/beatrun/gamemode/init.lua

@@ -2,18 +2,21 @@ AddCSLuaFile("cl_init.lua")
 AddCSLuaFile("shared.lua")
 include("shared.lua")
 
-for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/cl/*.lua", "GAME", "nameasc")) do
+for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/cl/*.lua", "GAME")) do
 	print(v)
+
 	AddCSLuaFile("cl/" .. v)
 end
 
-for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/sh/*.lua", "GAME", "nameasc")) do
+for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/sh/*.lua", "GAME")) do
 	print(v)
-	include("sh/" .. v)
+
 	AddCSLuaFile("sh/" .. v)
+	include("sh/" .. v)
 end
 
-for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/sv/*.lua", "GAME", "nameasc")) do
+for _, v in ipairs(file.Find("gamemodes/beatrun/gamemode/sv/*.lua", "GAME")) do
 	print(v)
+
 	include("sv/" .. v)
 end

beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua

@@ -319,7 +319,7 @@ end
 hook.Add("EntityFireBullets", "thisengineismadebyacrackhead", function(ent, data)
 	if not IsValid(ent) or not isfunction(ent.GetShootPos) or not ent:IsPlayer() then return end
 
-	for i, ply in ipairs(player.GetAll()) do
+	for _, ply in ipairs(player.GetAll()) do
 		if ply == ent then continue end
 
 		local fov = calc_fov(data.Dir:Angle(), (ply:GetShootPos() - data.Src):Angle())
@@ -374,7 +374,7 @@ end
 hook.Add("FinishMove", "BeatrunRHVelocity", function(ply, mv)
 	local activewep = ply:GetActiveWeapon()
 
-	if IsValid(activewep) and activewep:GetClass() == "runnerhands" and activewep.SetOwnerVelocity then
+	if ply:UsingRH() and activewep.SetOwnerVelocity then
 		activewep:SetOwnerVelocity(math.Round(mv:GetVelocity():Length()))
 	end
 end)

beatrun/gamemodes/beatrun/gamemode/sh/0_Helpers.lua

@@ -3,19 +3,6 @@ local playermeta = FindMetaTable("Player")
 
 CLoadout = {}
 
-function CLIENT_IFTP()
-	return CLIENT and IsFirstTimePredicted()
-end
-
---[[
-local matrixdatatmp = {
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
-	{0, 0, 0, 0},
-	{0, 0, 0, 1}
-}
-]]
-
 local mtmp = {
 	{0, 0, 0, 0},
 	{0, 0, 0, 0},
@@ -81,5 +68,20 @@ end
 
 function playermeta:UsingRH(wep)
 	local activewep = wep or self:GetActiveWeapon()
-	if IsValid(activewep) then return activewep:GetClass() == "runnerhands" end
+
+	if IsValid(activewep) and activewep:GetClass() == "runnerhands" then
+		return true
+	else
+		return false
+	end
+end
+
+function playermeta:notUsingRH(wep)
+	local activewep = wep or self:GetActiveWeapon()
+
+	if IsValid(activewep) and activewep:GetClass() ~= "runnerhands" then
+		return true
+	else
+		return false
+	end
 end

beatrun/gamemodes/beatrun/gamemode/sh/0_Misc.lua

@@ -1,6 +1,6 @@
-if SERVER then
+local allowPropSpawn = CreateConVar("Beatrun_AllowPropSpawn", "0", {FCVAR_ARCHIVE})
-	local allowPropSpawn = CreateConVar("Beatrun_AllowPropSpawn", "0", {FCVAR_ARCHIVE}, "Allow players to spawn props and entities")
 
+if SERVER then
 	util.AddNetworkString("SPParkourEvent")
 
 	local spawn = {"PlayerGiveSWEP", "PlayerSpawnEffect", "PlayerSpawnNPC", "PlayerSpawnObject", "PlayerSpawnProp", "PlayerSpawnRagdoll", "PlayerSpawnSENT", "PlayerSpawnSWEP", "PlayerSpawnVehicle"}
@@ -9,7 +9,7 @@ if SERVER then
 		if not ply:IsAdmin() and not allowPropSpawn:GetBool() then return false end
 	end
 
-	for k, v in ipairs(spawn) do
+	for _, v in ipairs(spawn) do
 		hook.Add(v, "BlockSpawn", BlockSpawn)
 	end
 
@@ -21,18 +21,18 @@ if SERVER then
 end
 
 if CLIENT then
-	CreateClientConVar("Beatrun_FOV", 100, true, true, "'Woah how are you moving this fast' and other hilarious jokes", 70, 120)
+	CreateClientConVar("Beatrun_FOV", 100, true, true, language.GetPhrase("beatrun.convars.fov"), 70, 120)
-	CreateClientConVar("Beatrun_CPSave", 1, true, true, "Respawning during a course will go back to the last hit checkpoint", 0, 1)
+	CreateClientConVar("Beatrun_CPSave", 1, true, true, language.GetPhrase("beatrun.convars.cpsave"), 0, 1)
 end
 
 hook.Add("PlayerNoClip", "BlockNoClip", function(ply, enabled)
 	if enabled and Course_Name ~= "" and ply:GetNW2Int("CPNum", 1) ~= -1 then
 		ply:SetNW2Int("CPNum", -1)
 
-		if CLIENT_IFTP() then
+		if CLIENT and IsFirstTimePredicted() then
-			notification.AddLegacy("Noclip Detected! Respawn to restart the course", NOTIFY_ERROR, 4)
+			notification.AddLegacy(language.GetPhrase("beatrun.misc.noclipdetected"), NOTIFY_ERROR, 4)
 		elseif SERVER and game.SinglePlayer() then
-			ply:SendLua("notification.AddLegacy(\"Noclip Detected! Respawn to restart the course\", NOTIFY_ERROR, 4)")
+			ply:SendLua("notification.AddLegacy(\"#beatrun.misc.noclipdetected\", NOTIFY_ERROR, 4)")
 		end
 	end
 
@@ -70,9 +70,7 @@ hook.Add("SetupMove", "JumpDetect", function(ply, mv, cmd)
 		end
 	end
 
-	local activewep = ply:GetActiveWeapon()
+	if ply:UsingRH() then
-
-	if IsValid(activewep) and activewep:GetClass() == "runnerhands" then
 		ply:SetWasOnGround(ply:OnGround())
 
 		return
@@ -106,11 +104,11 @@ hook.Add("SetupMove", "JumpDetect", function(ply, mv, cmd)
 end)
 
 hook.Add("CanProperty", "BlockProperty", function(ply)
-	if not ply:IsSuperAdmin() then return false end
+	if not ply:IsAdmin() then return false end
 end)
 
 hook.Add("CanDrive", "BlockDrive", function(ply)
-	if not ply:IsSuperAdmin() then return false end
+	if not ply:IsAdmin() then return false end
 end)
 
 if CLIENT and game.SinglePlayer() then
@@ -161,4 +159,4 @@ if CLIENT then
 		impactblurlerp = intensity
 		lastintensity = intensity
 	end
-end
+end

beatrun/gamemodes/beatrun/gamemode/sh/0_Sounds_!Precache.lua

@@ -2,6 +2,7 @@ soundAdd_old = sound.Add
 
 local function soundAdd_detour(tbl)
 	if not tbl.name then return end
+
 	soundAdd_old(tbl)
 
 	timer.Simple(2, function()

beatrun/gamemodes/beatrun/gamemode/sh/Balance.lua

@@ -75,7 +75,7 @@ hook.Add("SetupMove", "Balance", function(ply, mv, cmd)
 			ParkourEvent("walkbalancestill", ply)
 		end
 
-		if CLIENT_IFTP() and mv:KeyPressed(IN_ATTACK2) then
+		if CLIENT and IsFirstTimePredicted() and mv:KeyPressed(IN_ATTACK2) then
 			dircache.y = dircache.y - 180
 		end
 

beatrun/gamemodes/beatrun/gamemode/sh/BuildMode.lua

@@ -1,23 +1,28 @@
 local mousex = 0
 local mousey = 0
 local inf = math.huge
+
 buildmode_props = {}
+
 local propmatsblacklist = {}
 local blocksdir = "models/hunter/blocks/"
 local blocksdir_s = blocksdir .. "*.mdl"
-for k, v in ipairs(file.Find(blocksdir_s, "GAME")) do
+
+for _, v in ipairs(file.Find(blocksdir_s, "GAME")) do
 	table.insert(buildmode_props, blocksdir .. v:lower())
 end
 
 local blocksdir = "models/hunter/triangles/"
 local blocksdir_s = blocksdir .. "*.mdl"
-for k, v in ipairs(file.Find(blocksdir_s, "GAME")) do
+
+for _, v in ipairs(file.Find(blocksdir_s, "GAME")) do
 	table.insert(buildmode_props, blocksdir .. v:lower())
 end
 
 local blocksdir = "models/props_phx/construct/glass/"
 local blocksdir_s = blocksdir .. "*.mdl"
-for k, v in ipairs(file.Find(blocksdir_s, "GAME")) do
+
+for _, v in ipairs(file.Find(blocksdir_s, "GAME")) do
 	local key = table.insert(buildmode_props, blocksdir .. v:lower())
 	propmatsblacklist[key] = true
 end
@@ -323,9 +328,6 @@ if SERVER then
 	util.AddNetworkString("BuildMode_Sync")
 	util.AddNetworkString("Course_Stop")
 
-	buildmodelogs = {}
-	local buildmodelogs = buildmodelogs
-
 	function Course_Sync()
 		net.Start("BuildMode_Sync")
 			net.WriteFloat(Course_StartPos.x)
@@ -423,10 +425,6 @@ if SERVER then
 		end
 
 		table.insert(buildmode_placed, a)
-
-		local bmlog = tostring(ply) .. " placed " .. tostring(a)
-
-		table.insert(buildmodelogs, bmlog)
 	end)
 
 	net.Receive("BuildMode_Duplicate", function(len, ply)
@@ -435,7 +433,7 @@ if SERVER then
 		local selected = net.ReadTable()
 		local selectedents = net.ReadTable()
 
-		for k, v in pairs(selected) do
+		for _, v in pairs(selected) do
 			local a = ents.Create("prop_physics")
 			a:SetModel(v:GetModel())
 
@@ -456,17 +454,13 @@ if SERVER then
 			a:SetHealth(inf)
 		end
 
-		for k, v in pairs(selectedents) do
+		for _, v in pairs(selectedents) do
 			local a = ents.Create(v:GetClass())
 
 			a:SetPos(v:GetPos())
 			a:SetAngles(v:GetAngles())
 			a:Spawn()
 		end
-
-		local bmlog = tostring(ply) .. " duped " .. tostring(table.Count(selected)) .. " props"
-
-		table.insert(buildmodelogs, bmlog)
 	end)
 
 	net.Receive("BuildMode_Delete", function(len, ply)
@@ -474,15 +468,11 @@ if SERVER then
 
 		local selected = net.ReadTable()
 
-		for k, v in pairs(selected) do
+		for _, v in pairs(selected) do
 			if IsValid(v) then
 				v:Remove()
 			end
 		end
-
-		local bmlog = tostring(ply) .. " deleted " .. tostring(table.Count(selected)) .. " entities"
-
-		table.insert(buildmodelogs, bmlog)
 	end)
 
 	net.Receive("BuildMode_Highlight", function(len, ply)
@@ -490,7 +480,7 @@ if SERVER then
 
 		local selected = net.ReadTable()
 
-		for k, v in pairs(selected) do
+		for _, v in pairs(selected) do
 			v.hr = not v.hr
 
 			CustomPropMat(v)
@@ -508,10 +498,10 @@ if SERVER then
 	net.Receive("BuildMode_ReadSave", function(len, ply)
 		if not ply.BuildMode then return end
 
-		local a = util.Decompress(net.ReadData(len))
+		local a = net.ReadData(len)
 		local props = util.JSONToTable(a)
 
-		for k, v in pairs(props) do
+		for _, v in pairs(props) do
 			local a = ents.Create("prop_physics")
 
 			a:SetModel(buildmode_props[v.model])
@@ -611,7 +601,7 @@ if SERVER then
 		local name = data[5]
 		local entities = data[6]
 
-		for k, v in pairs(props) do
+		for _, v in pairs(props) do
 			local a = ents.Create("prop_physics")
 			a.hr = v.hr
 			a:SetModel(buildmode_props[v.model])
@@ -629,7 +619,7 @@ if SERVER then
 			a:SetHealth(inf)
 		end
 
-		for k, v in ipairs(cp) do
+		for _, v in ipairs(cp) do
 			LoadCheckpoints()
 
 			local a = ents.Create("tt_cp")
@@ -641,7 +631,7 @@ if SERVER then
 		end
 
 		if entities then
-			for k, v in ipairs(entities) do
+			for _, v in ipairs(entities) do
 				local a = ents.Create(v.ent)
 				local dontsetpos = nil
 
@@ -666,7 +656,7 @@ if SERVER then
 
 		Course_Sync()
 
-		for k, v in pairs(player.GetAll()) do
+		for _, v in pairs(player.GetAll()) do
 			v:SetNW2Float("PBTime", 0)
 			v:SetNW2Int("CPNum", 1)
 			v:SetMoveType(MOVETYPE_WALK)
@@ -898,7 +888,7 @@ if CLIENT then
 	function CourseData(name)
 		local save = {{}, {}, Course_StartPos, Course_StartAng, name or "Unnamed", {}}
 
-		for k, v in pairs(buildmode_placed) do
+		for _, v in pairs(buildmode_placed) do
 			if not IsValid(v) then -- Nothing
 			elseif v:GetNW2Bool("BRProtected") then
 				print("ignoring protected ent")
@@ -930,7 +920,7 @@ if CLIENT then
 			end
 		end
 
-		for k, v in ipairs(Checkpoints) do
+		for _, v in ipairs(Checkpoints) do
 			table.insert(save[2], v:GetPos())
 		end
 
@@ -958,7 +948,6 @@ if CLIENT then
 
 	concommand.Add("Beatrun_SaveCourse", function(ply, cmd, args, argstr)
 		local name = args[1] or "Unnamed"
-		-- local compress = not args[2]
 
 		SaveCourse(name, args[2])
 	end)
@@ -1155,24 +1144,13 @@ if CLIENT then
 			end
 		end,
 		[KEY_BACKSPACE] = function()
-			if not dragging then
+			buildmodeinputs[KEY_DELETE]()
-				local props = {}
-
-				for k, v in pairs(buildmode_selected) do
-					table.insert(props, k)
-					buildmode_selected[k] = nil
-				end
-
-				net.Start("BuildMode_Delete")
-					net.WriteTable(props)
-				net.SendToServer()
-			end
 		end,
 		[KEY_T] = function()
 			if not dragging then
 				local props = {}
 
-				for k, v in pairs(buildmode_selected) do
+				for k, _ in pairs(buildmode_selected) do
 					if not propmatsblacklist[buildmode_props_index[k:GetModel()]] then
 						table.insert(props, k)
 					end
@@ -1216,7 +1194,7 @@ if CLIENT then
 				end
 			end
 		end,
-		[KEY_ENTER] = function()
+		[KEY_PAD_MINUS] = function()
 			if table.Count(buildmode_selected) == 0 then return end
 
 			local save = {}
@@ -1239,7 +1217,7 @@ if CLIENT then
 			local jsonsave = util.TableToJSON(save)
 
 			file.CreateDir("beatrun/savedbuilds")
-			file.Write("beatrun/savedbuilds/save.txt", util.Compress(jsonsave))
+			file.Write("beatrun/savedbuilds/save.txt", jsonsave)
 		end,
 		[KEY_PAD_PLUS] = function()
 			local save = file.Read("beatrun/savedbuilds/save.txt", "DATA")
@@ -1453,7 +1431,7 @@ if CLIENT then
 
 			cam.Start3D()
 
-				for k, v in ipairs(buildmode_placed) do
+				for _, v in ipairs(buildmode_placed) do
 					if IsValid(v) and not v:GetNW2Bool("BRProtected") then
 						local pos = v:GetRenderOrigin() or v:GetPos()
 						local w2s = pos:ToScreen()
@@ -1546,7 +1524,7 @@ if CLIENT then
 		surface.SetFont("DebugFixed")
 		surface.SetTextColor(255, 255, 255)
 
-		for k, v in pairs(Checkpoints) do
+		for _, v in pairs(Checkpoints) do
 			if not IsValid(v) then
 				LoadCheckpoints()
 
@@ -1557,7 +1535,7 @@ if CLIENT then
 			local num = v:GetCPNum()
 
 			surface.SetTextPos(w2s.x, w2s.y)
-			surface.DrawText(num)
+			surface.DrawText("Checkpoint: " .. num)
 		end
 
 		local startw2s = Course_StartPos:ToScreen()
@@ -1637,4 +1615,4 @@ if CLIENT then
 			hook.Run("BuildModeState", false)
 		end
 	end)
-end
+end

beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua

@@ -44,28 +44,28 @@ function LoadCheckpoints()
 	table.Empty(Checkpoints)
 
 	if SERVER then
-		for k, v in pairs(player.GetAll()) do
+		for _, v in pairs(player.GetAll()) do
 			v:SetNW2Int("CPNum", 1)
 		end
 	end
 
 	if CLIENT then
 		timer.Simple(1, function()
-			for k, v in pairs(ents.FindByClass("tt_cp")) do
+			for _, v in pairs(ents.FindByClass("tt_cp")) do
 				if IsValid(v) and v.GetCPNum then
 					Checkpoints[v:GetCPNum()] = v
 				end
 			end
 		end)
 	else
-		for k, v in pairs(ents.FindByClass("tt_cp")) do
+		for _, v in pairs(ents.FindByClass("tt_cp")) do
 			Checkpoints[v:GetCPNum()] = v
 		end
 	end
 end
 
 if CLIENT then
-	CreateClientConVar("Beatrun_FastStart", "0", true, true, "Faster start countdown", 0, 1)
+	CreateClientConVar("Beatrun_FastStart", "0", true, true, language.GetPhrase("beatrun.convars.faststart"), 0, 1)
 
 	net.Receive("Checkpoint_Hit", function()
 		local timetaken = CurTime() - lastcptime
@@ -181,7 +181,11 @@ end
 local countdown = 0
 local countdownalpha = 255
 
-local countdowntext = {"Ready", "Set", "Go!!"}
+local countdowntext = {
+	"#beatrun.checkpoints.countdown1",
+	"#beatrun.checkpoints.countdown2",
+	"#beatrun.checkpoints.countdown3"
+}
 
 local function StartCountdown()
 	local CT = CurTime()
@@ -243,7 +247,8 @@ function CourseHUD()
 			speed = "0" .. speed
 		end
 
-		text = speed .. " km/h"
+		text = language.GetPhrase("beatrun.checkpoints.speedometer"):format(speed)
+
 		local w, _ = surface.GetTextSize(text)
 		w = w or 0
 

beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua

@@ -159,7 +159,7 @@ local function ClimbingThink(ply, mv, cmd)
 
 			ParkourEvent("hangend", ply)
 
-			if CLIENT_IFTP() then
+			if CLIENT and IsFirstTimePredicted() then
 				lockang2 = false
 				lockang = false
 				BodyLimitX = 90
@@ -182,7 +182,7 @@ local function ClimbingThink(ply, mv, cmd)
 			ply:SetSafetyRollKeyTime(CurTime() + 0.1)
 			ParkourEvent("hangjump", ply)
 
-			if CLIENT_IFTP() then
+			if CLIENT and IsFirstTimePredicted() then
 				lockang2 = false
 				lockang = false
 				BodyLimitX = 90
@@ -649,11 +649,7 @@ local function ClimbingCheck(ply, mv, cmd)
 
 	local activewep = ply:GetActiveWeapon()
 
-	if IsValid(activewep) then
+	if ply:UsingRH() and activewep.SendWeaponAnim then
-		usingrh = activewep:GetClass() == "runnerhands"
-	end
-
-	if usingrh and activewep.SendWeaponAnim then
 		activewep:SendWeaponAnim(ACT_VM_HITCENTER)
 		activewep:SetBlockAnims(false)
 	end
@@ -716,7 +712,7 @@ local function ClimbingCheck(ply, mv, cmd)
 		ply:EmitSound("Handsteps.ConcreteHard")
 		ply:EmitSound("Cloth.RollLand")
 
-		if CLIENT_IFTP() then
+		if CLIENT and IsFirstTimePredicted() then
 			ply.OrigEyeAng = wallang
 			lockang2 = true
 

beatrun/gamemodes/beatrun/gamemode/sh/Conflicts.lua

@@ -4,7 +4,7 @@ local problematichooks = {
 
 local function RemoveConflicting()
 	for k, v in pairs(problematichooks) do
-		for l, b in ipairs(v) do
+		for _, b in ipairs(v) do
 			hook.Remove(k, b)
 		end
 	end

beatrun/gamemodes/beatrun/gamemode/sh/CrouchJump.lua

@@ -1,4 +1,3 @@
-local usingrh = nil
 local punch = Angle(0.5, 0, 0)
 local punchland = Angle(10, 0, 0.5)
 local punchthink = Angle()
@@ -30,13 +29,9 @@ hook.Add("SetupMove", "CrouchJump", function(ply, mv, cmd)
 		ply:SetCrouchJumpBlocked(false)
 	end
 
+	local activewep = ply:GetActiveWeapon()
+
 	if ply:Alive() and not ply:GetCrouchJumpBlocked() and not IsValid(ply:GetZipline()) and not IsValid(ply:GetLadder()) and ply:GetClimbing() == 0 and not ply:GetJumpTurn() and ply:GetMantle() == 0 and not ply:OnGround() and ply:GetVelocity().z > -350 and ply:GetCrouchJumpTime() < CurTime() and ply:GetWallrun() == 0 and mv:KeyPressed(IN_DUCK) then
-		local activewep = ply:GetActiveWeapon()
-
-		if IsValid(activewep) then
-			usingrh = activewep:GetClass() == "runnerhands"
-		end
-
 		if CLIENT then
 			local ang = ply:EyeAngles()
 			ang.x = 0
@@ -47,7 +42,7 @@ hook.Add("SetupMove", "CrouchJump", function(ply, mv, cmd)
 				BodyAnimCycle = 0
 				BodyAnimCrouchLerp = 0
 
-				if usingrh then
+				if ply:UsingRH() then
 					BodyAnimCrouchLerpZ = mv:GetOrigin().z - 32
 				else
 					BodyAnimCrouchLerpZ = mv:GetOrigin().z
@@ -70,16 +65,10 @@ hook.Add("SetupMove", "CrouchJump", function(ply, mv, cmd)
 		ply:ViewPunch(punch)
 		ply:SetViewOffsetDucked(Vector(0, 0, 28))
 
-		if usingrh then
+		if ply:UsingRH() then
 			activewep:SendWeaponAnim(ACT_VM_HOLSTER)
 		end
 	elseif (ply:OnGround() or ply:GetCrouchJumpTime() < CurTime() or not ply:Alive()) and ply:GetCrouchJump() then
-		local activewep = ply:GetActiveWeapon()
-
-		if IsValid(activewep) then
-			usingrh = activewep:GetClass() == "runnerhands"
-		end
-
 		if game.SinglePlayer() then
 			net.Start("CrouchJumpSP")
 				net.WriteBool(false)
@@ -88,7 +77,7 @@ hook.Add("SetupMove", "CrouchJump", function(ply, mv, cmd)
 
 		ply:SetCrouchJump(false)
 
-		if usingrh and IsValid(activewep) then
+		if ply:UsingRH() then
 			activewep:SendWeaponAnim(ACT_VM_DRAW)
 		end
 

beatrun/gamemodes/beatrun/gamemode/sh/DataTheft.lua

@@ -1,4 +1,3 @@
-GM_DATATHEFT = 0
 DATATHEFT_LOADOUTS = {
 	{"weapon_357", "weapon_ar2"}
 }
@@ -87,7 +86,7 @@ if CLIENT then
 		if GetGlobalBool("GM_DATATHEFT") then
 			local datacubes = LocalPlayer():GetNW2Int("DataCubes", 0)
 
-			return "Data Theft (" .. datacubes .. ")"
+			return language.GetPhrase("beatrun.datatheft.name"):format(datacubes)
 		else
 			hook.Remove("BeatrunHUDCourse", "DataTheftHUDName")
 		end
@@ -99,6 +98,6 @@ if CLIENT then
 
 	net.Receive("DataTheft_Start", function()
 		hook.Add("BeatrunHUDCourse", "DataTheftHUDName", DataTheftHUDName)
-		chat.AddText(Color(200, 200, 200), "Data Theft! Kill players to collect data, deposit data in banks")
+		chat.AddText(Color(200, 200, 200), language.GetPhrase("beatrun.datatheft.start"))
 	end)
 end

beatrun/gamemodes/beatrun/gamemode/sh/Deathmatch.lua

@@ -1,5 +1,3 @@
-GM_DEATHMATCH = 0
-
 if SERVER then
 	util.AddNetworkString("Deathmatch_Start")
 	util.AddNetworkString("Deathmatch_Sync")
@@ -17,7 +15,8 @@ if SERVER then
 			else
 				for _, b in ipairs(DATATHEFT_LOADOUTS[math.random(#DATATHEFT_LOADOUTS)]) do
 					local wep = v:Give(b)
-					v:GiveAmmo(1000, wep:GetPrimaryAmmoType())
+
+					v:GiveAmmo(9999, wep:GetPrimaryAmmoType() or "Pistol", true)
 				end
 			end
 		end
@@ -66,7 +65,7 @@ end
 if CLIENT then
 	local function DeathmatchHUDName()
 		if GetGlobalBool("GM_DEATHMATCH") then
-			return "Deathmatch"
+			return "#beatrun.deathmatch.name"
 		else
 			hook.Remove("BeatrunHUDCourse", "DeathmatchHUDName")
 		end
@@ -78,6 +77,6 @@ if CLIENT then
 
 	net.Receive("Deathmatch_Start", function()
 		hook.Add("BeatrunHUDCourse", "DeathmatchHUDName", DeathmatchHUDName)
-		chat.AddText(Color(200, 200, 200), "Deathmatch! Kill players to get points!")
+		chat.AddText(Color(200, 200, 200), language.GetPhrase("beatrun.deathmatch.start"))
 	end)
 end

beatrun/gamemodes/beatrun/gamemode/sh/Dive.lua

@@ -1,7 +1,7 @@
-local totsugeki = CreateConVar("Beatrun_Totsugeki", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "Oh no...", 0, 1)
+local totsugeki = CreateConVar("Beatrun_Totsugeki", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 0, 1)
-local totsugekispam = CreateConVar("Beatrun_TotsugekiSpam", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "OH NO...", 0, 1)
+local totsugekispam = CreateConVar("Beatrun_TotsugekiSpam", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 0, 1)
-local totsugekiheading = CreateConVar("Beatrun_TotsugekiHeading", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "Can we dive on the x axis?", 0, 1)
+local totsugekiheading = CreateConVar("Beatrun_TotsugekiHeading", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 0, 1)
-local totsugekidir = CreateConVar("Beatrun_TotsugekiDir", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "Can we dive into another dir?", 0, 1)
+local totsugekidir = CreateConVar("Beatrun_TotsugekiDir", 0, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 0, 1)
 
 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
@@ -37,7 +37,7 @@ local function Dive(ply, mv, cmd)
 				effectdata:SetOrigin(vPoint)
 
 				util.Effect("WaterSurfaceExplosion", effectdata)
-			elseif CLIENT_IFTP() then
+			elseif CLIENT and IsFirstTimePredicted() then
 				local vPoint = mv:GetOrigin()
 				local effectdata = EffectData()
 

beatrun/gamemodes/beatrun/gamemode/sh/FreerunSysAll.lua

@@ -1,5 +1,6 @@
 local quakejump = CreateConVar("Beatrun_QuakeJump", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE})
 local sidestep = CreateConVar("Beatrun_SideStep", 1, {FCVAR_REPLICATED, FCVAR_ARCHIVE})
+local speed_limit = CreateConVar("Beatrun_SpeedLimit", 325, {FCVAR_REPLICATED, FCVAR_ARCHIVE})
 
 local function Hardland(jt)
 	local ply = LocalPlayer()
@@ -16,6 +17,7 @@ local function Hardland(jt)
 			end
 
 			DoJumpTurn(jt)
+
 			BodyAnim:SetSequence("jumpturnflyidle")
 		else
 			BodyAnim:SetSequence("jumpcoilend")
@@ -34,8 +36,7 @@ if game.SinglePlayer() and CLIENT then
 end
 
 hook.Add("PlayerStepSoundTime", "MEStepTime", function(ply, step, walking)
-	local activewep = ply:GetActiveWeapon()
+	local sprint = ply:GetMEMoveLimit() < speed_limit:GetInt() - 25
-	local sprint = ply:GetMEMoveLimit() < 300
 	local stepmod = ply:GetStepRight() and 1 or -1
 	local stepvel = 1.25
 	local stepvel2 = 1
@@ -49,7 +50,7 @@ hook.Add("PlayerStepSoundTime", "MEStepTime", function(ply, step, walking)
 	local stepmod2 = 1
 	local stepmod3 = 1
 
-	if IsValid(activewep) and activewep:GetClass() ~= "runnerhands" then
+	if ply:notUsingRH() then
 		stepmod2 = 0.25
 
 		if not ply:IsSprinting() then
@@ -57,7 +58,7 @@ hook.Add("PlayerStepSoundTime", "MEStepTime", function(ply, step, walking)
 		end
 	end
 
-	if not ply:Crouching() and not ply:KeyDown(IN_WALK) then
+	if not ply:Crouching() and not walking then
 		if game.SinglePlayer() then
 			local intensity = ply:GetInfoNum("Beatrun_ViewbobIntensity", 20) / 20
 
@@ -92,7 +93,7 @@ hook.Add("PlayerFootstep", "MEStepSound", function(ply, pos, foot, sound, volume
 	ply:SetStepRight(not ply:GetStepRight())
 
 	if (ply:GetSliding() or CurTime() < ply:GetSafetyRollTime() - 0.5) and not skipcheck then return true end
-	if ply:GetMEMoveLimit() < 155 and ply:KeyDown(IN_FORWARD) and not ply.FootstepLand and not IsValid(ply:GetBalanceEntity()) then return true end
+	if ply:GetMEMoveLimit() < 100 and ply:KeyDown(IN_FORWARD) and not ply.FootstepLand and not IsValid(ply:GetBalanceEntity()) then return true end
 
 	local mat = sound:sub(0, -6)
 	local newsound = FOOTSTEPS_LUT[mat]
@@ -124,11 +125,11 @@ hook.Add("PlayerFootstep", "MEStepSound", function(ply, pos, foot, sound, volume
 		ply:EmitSound("Footsteps.Water")
 	end
 
-	if ply:InOverdrive() and ply:GetVelocity():Length() > 300 then
+	if ply:InOverdrive() and ply:GetVelocity():Length() > 400 then
 		ply:EmitSound("Footsteps.Spark")
 	end
 
-	if (CLIENT_IFTP() or game.SinglePlayer()) and ply.FootstepLand then
+	if (CLIENT and IsFirstTimePredicted() or game.SinglePlayer()) and ply.FootstepLand then
 		local landsound = FOOTSTEPS_LAND_LUT[mat] or "Concrete"
 
 		ply:EmitSound("Land." .. landsound)
@@ -157,7 +158,7 @@ hook.Add("OnPlayerHitGround", "MELandSound", function(ply, water, floater, speed
 	ParkourEvent("land", ply)
 
 	if ply:GetMelee() == MELEE_DROPKICK and ply:GetMeleeTime() < CurTime() and vel:Length() < 300 then
-		if CLIENT_IFTP() then
+		if CLIENT and IsFirstTimePredicted() then
 			Hardland(false)
 		elseif SERVER and game.SinglePlayer() then
 			net.Start("Beatrun_HardLand")
@@ -185,7 +186,7 @@ hook.Add("OnPlayerHitGround", "MELandSound", function(ply, water, floater, speed
 			ply:SetJumpTurn(true)
 		end
 
-		if CLIENT_IFTP() then
+		if CLIENT and IsFirstTimePredicted() then
 			Hardland(jt)
 		elseif SERVER and game.SinglePlayer() then
 			net.Start("Beatrun_HardLand")
@@ -210,8 +211,7 @@ hook.Add("OnPlayerHitGround", "MELandSound", function(ply, water, floater, speed
 end)
 
 hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
-	local activewep = ply:GetActiveWeapon()
+	local usingrh = ply:UsingRH()
-	local usingrh = IsValid(activewep) and activewep:GetClass() == "runnerhands"
 	local ismoving = (mv:KeyDown(IN_FORWARD) or not ply:OnGround() or ply:Crouching()) and not mv:KeyDown(IN_BACK) and ply:Alive() and (mv:GetVelocity():Length() > 50 or ply:GetMantle() ~= 0 or ply:Crouching())
 
 	if (CLIENT or game.SinglePlayer()) and CurTime() > (ply:GetStepRelease() or 0) and ply.FootstepReleaseLand then
@@ -229,12 +229,12 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 		ply.FootstepLand = true
 	end
 
-	if ply:GetRunSpeed() ~= 325 * ply:GetOverdriveMult() then
+	if ply:GetRunSpeed() ~= speed_limit:GetInt() * ply:GetOverdriveMult() then
-		ply:SetRunSpeed(325 * ply:GetOverdriveMult())
+		ply:SetRunSpeed(speed_limit:GetInt() * ply:GetOverdriveMult())
 	end
 
 	if not ply:GetMEMoveLimit() then
-		ply:SetMEMoveLimit(150)
+		ply:SetMEMoveLimit(speed_limit:GetInt())
 		ply:SetMESprintDelay(0)
 		ply:SetMEAng(0)
 	end
@@ -246,8 +246,6 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 		ply:SetMEMoveLimit(150)
 		ply:SetMESprintDelay(0)
 		ply:SetMEAng(0)
-
-		-- mv:SetButtons(bit.band(mv:GetButtons(), bit.bnot(IN_JUMP)))
 	end
 
 	local ang = mv:GetAngles()
@@ -259,14 +257,14 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 	local weaponspeed = 150
 	local activewep = ply:GetActiveWeapon()
 
-	if IsValid(activewep) and activewep:GetClass() ~= "runnerhands" then
+	if ply:notUsingRH() then
-		weaponspeed = 250
+		weaponspeed = speed_limit:GetInt()
 	end
 
 	if (ismoving or ply:GetMantle() ~= 0) and ply:GetMESprintDelay() < CurTime() and (cmd:KeyDown(IN_SPEED) or ply:GetMantle() ~= 0 or not ply:OnGround() or (not ply:OnGround() or ply:GetMantle() ~= 0) and mv:GetVelocity().z > -450) then
-		local mult = 0.6 + math.abs(ply:GetMEMoveLimit() / 300 - 1)
+		local mult = 0.6 + math.abs(ply:GetMEMoveLimit() / (speed_limit:GetInt() - 25) - 1)
 
-		if not ply:InOverdrive() and ply:GetMEMoveLimit() > 225 then
+		if not ply:InOverdrive() and ply:GetMEMoveLimit() > (speed_limit:GetInt() - 100) then
 			mult = mult * 0.35
 		end
 
@@ -274,9 +272,9 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 			mult = mult * ply:GetMEMoveLimit() / 1000
 		end
 
-		ply:SetMEMoveLimit(math.Clamp(ply:GetMEMoveLimit() + mult * ply:GetOverdriveMult() * 2, 0, 325 * ply:GetOverdriveMult()))
+		ply:SetMEMoveLimit(math.Clamp(ply:GetMEMoveLimit() + mult * ply:GetOverdriveMult() * 2, 0, speed_limit:GetInt() * ply:GetOverdriveMult()))
 	elseif not ismoving and (not ply:Crouching() or ply:GetCrouchJump()) or CurTime() < ply:GetMESprintDelay() and ply:OnGround() then
-		ply:SetMEMoveLimit(math.Clamp(ply:GetMEMoveLimit() - 40, weaponspeed, 325 * ply:GetOverdriveMult()))
+		ply:SetMEMoveLimit(math.Clamp(ply:GetMEMoveLimit() - 40, weaponspeed, speed_limit:GetInt() * ply:GetOverdriveMult()))
 	end
 
 	if MEAngDiff > 1.25 and ply:GetWallrun() == 0 then
@@ -288,9 +286,9 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 		local stepheight = mv:GetOrigin().z - (ply.LastOrigin or vector_origin).z
 
 		if stepheight > 1.5 then
-			ply:SetMEMoveLimit(math.Approach(ply:GetMEMoveLimit(), 250, FrameTime() * 100))
+			ply:SetMEMoveLimit(math.Approach(ply:GetMEMoveLimit(), speed_limit:GetInt() - 75, FrameTime() * 100))
 		elseif stepheight < -0.8 then
-			ply:SetMEMoveLimit(math.Approach(ply:GetMEMoveLimit(), 400, FrameTime() * 100))
+			ply:SetMEMoveLimit(math.Approach(ply:GetMEMoveLimit(), speed_limit:GetInt() + 75, FrameTime() * 100))
 		end
 	end
 
@@ -310,7 +308,7 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 			activewep:SendWeaponAnim(ACT_TURNLEFT45)
 			activewep:SetSideStep(true)
 
-			mv:SetVelocity(cmd:GetViewAngles():Right() * -600)
+			mv:SetVelocity(cmd:GetViewAngles():Right() * -(speed_limit:GetInt() * 1.8))
 
 			ply:ViewPunch(Angle(-3, 0, -4.5))
 
@@ -325,7 +323,7 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 			activewep:SendWeaponAnim(ACT_TURNRIGHT45)
 			activewep:SetSideStep(true)
 
-			mv:SetVelocity(cmd:GetViewAngles():Right() * 600)
+			mv:SetVelocity(cmd:GetViewAngles():Right() * (speed_limit:GetInt() * 1.8))
 
 			ply:ViewPunch(Angle(-3, 0, 4.5))
 
@@ -341,7 +339,7 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 		local forwarddelta = activewep.SideStepDir:Dot(ang:Forward())
 
 		if forwarddelta > 0.35 then
-			ply:SetMEMoveLimit(250)
+			ply:SetMEMoveLimit(speed_limit:GetInt())
 		end
 
 		if forwarddelta < 0.65 then
@@ -356,7 +354,7 @@ hook.Add("SetupMove", "MESetupMove", function(ply, mv, cmd)
 		if mv:KeyPressed(IN_JUMP) and not quakejump:GetBool() and activewep:GetWasOnGround() and not ply:GetJumpTurn() and ply:GetViewModel():GetCycle() < 0.25 then
 			local vel = mv:GetVelocity()
 			vel:Mul(0.75)
-			vel.z = -300
+			vel.z = -speed_limit:GetInt() + 25
 
 			mv:SetVelocity(vel)
 
@@ -370,7 +368,6 @@ if CLIENT then
 
 	hook.Add("CreateMove", "MECreateMove", function(cmd)
 		local ply = LocalPlayer()
-		local usingrh = ply:UsingRH()
 		local hardland = CurTime() < (ply.hardlandtime or 0)
 
 		if hardland and not ply:InOverdrive() then
@@ -379,7 +376,7 @@ if CLIENT then
 			cmd:SetSideMove(cmd:GetSideMove() * 0.01)
 		end
 
-		if (ply:InOverdrive() or usingrh and ply:GetMoveType() == MOVETYPE_WALK and not hardland and ply:OnGround()) and not cmd:KeyDown(IN_SPEED) and not ply:GetSliding() and not IsValid(ply:GetBalanceEntity()) then
+		if (ply:InOverdrive() or ply:UsingRH() and ply:GetMoveType() == MOVETYPE_WALK and not hardland and ply:OnGround()) and not cmd:KeyDown(IN_SPEED) and not ply:GetSliding() and not IsValid(ply:GetBalanceEntity()) then
 			cmd:SetButtons(cmd:GetButtons() + IN_SPEED)
 		end
 	end)
@@ -396,7 +393,7 @@ if CLIENT then
 			vel = vector_origin
 		end
 
-		if vel:Length() > 300 then
+		if vel:Length() > speed_limit:GetInt() + 75 then
 			ply.blurspeed = Lerp(0.001, ply.blurspeed, 0.1)
 		elseif ply:GetMantle() == 0 then
 			ply.blurspeed = math.Approach(ply.blurspeed, 0, 0.005)

beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua

@@ -1,18 +1,15 @@
-local disable_grapple = CreateClientConVar("Beatrun_DisableGrapple", 0, true, true, "Disables grapple ability", 0, 1)
-
 if CLIENT then
+	local disable_grapple = CreateClientConVar("Beatrun_DisableGrapple", 0, true, true, language.GetPhrase("beatrun.convars.disablegrapple"), 0, 1)
+
 	local circle = Material("circlesmooth.png", "nocull smooth")
 
 	hook.Add("HUDPaint", "grappleicon", function()
 		local ply = LocalPlayer()
 
-		if disable_grapple:GetBool() then return end
+		if disable_grapple:GetBool() and Course_Name == "" then return end
 		if ply:GetMantle() ~= 0 or ply:GetClimbing() ~= 0 then return end
 		if not ply:Alive() or Course_Name ~= "" then return end
-
+		if ply:notUsingRH() then return end
-		local activewep = ply:GetActiveWeapon()
-
-		if IsValid(activewep) and activewep:GetClass() ~= "runnerhands" then return end
 		if ply:GetMoveType() == MOVETYPE_NOCLIP then return end
 		if GetGlobalBool("GM_INFECTION") or GetGlobalBool("GM_DATATHEFT") or GetGlobalBool("GM_DEATHMATCH") then return end
 
@@ -60,8 +57,7 @@ hook.Add("SetupMove", "Grapple", function(ply, mv, cmd)
 	if not ply:Alive() or Course_Name ~= "" and ply:GetNW2Int("CPNum", 1) ~= -1 and not ply:GetNW2Entity("Swingrope"):IsValid() then return end
 	if GetGlobalBool("GM_INFECTION") or GetGlobalBool("GM_DATATHEFT") or GetGlobalBool("GM_DEATHMATCH") and not ply:GetNW2Entity("Swingrope"):IsValid() then return end
 
-	local activewep = ply:GetActiveWeapon()
+	local usingrh = ply:UsingRH()
-	local usingrh = IsValid(activewep) and activewep:GetClass() == "runnerhands"
 
 	if not ply.Grapple_tr then
 		ply.Grapple_tr = {}
@@ -91,7 +87,7 @@ hook.Add("SetupMove", "Grapple", function(ply, mv, cmd)
 			ply:SetNW2Entity("grappleEntity", trout.Entity)
 			ply:SetNW2Bool("grappledNonCourse", true)
 
-			if CLIENT_IFTP() or game.SinglePlayer() then
+			if CLIENT and IsFirstTimePredicted() or game.SinglePlayer() then
 				ply:EmitSound("MirrorsEdge/Gadgets/ME_Magrope_Fire.wav", 40, 100 + math.random(-25, 10))
 			end
 
@@ -131,7 +127,7 @@ hook.Add("SetupMove", "Grapple", function(ply, mv, cmd)
 
 			ply:SetGrappling(false)
 
-			if CLIENT_IFTP() or game.SinglePlayer() then
+			if CLIENT and IsFirstTimePredicted() or game.SinglePlayer() then
 				ply:EmitSound("MirrorsEdge/zipline_detach.wav", 40, 100 + math.random(-25, 10))
 			end
 

beatrun/gamemodes/beatrun/gamemode/sh/Infection.lua

@@ -1,7 +1,9 @@
-GM_INFECTION = 0
 Infection_StartTime = 0
 Infection_EndTime = 0
 
+local startTime = CreateConVar("Beatrun_InfectionStartTime", 10, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 5, 20)
+local gameTime = CreateConVar("Beatrun_InfectionGameTime", 190, {FCVAR_REPLICATED, FCVAR_ARCHIVE}, "", 30, 600)
+
 function table.Shuffle(t)
 	local n = #t
 
@@ -18,7 +20,7 @@ end
 local function HumanCount()
 	local count = 0
 
-	for k, v in ipairs(player.GetAll()) do
+	for _, v in ipairs(player.GetAll()) do
 		if IsValid(v) and not v:GetNW2Bool("Infected") then
 			count = count + 1
 		end
@@ -240,8 +242,8 @@ if SERVER then
 			end
 		end
 
-		Infection_StartTime = CurTime() + 10
+		Infection_StartTime = CurTime() + startTime:GetInt()
-		Infection_EndTime = CurTime() + 190
+		Infection_EndTime = CurTime() + gameTime:GetInt()
 
 		hook.Add("Think", "InfectionTimer", InfectionTimer)
 	end
@@ -284,7 +286,7 @@ if SERVER then
 
 			if timeremaining <= 70 and timeremaining >= 50 and player.GetCount() > 6 and humancount == 1 then
 				timer.Simple(0.1, function()
-					for k, v in ipairs(player.GetAll()) do
+					for _, v in ipairs(player.GetAll()) do
 						if v:Alive() and not v:GetNW2Bool("Infected") then
 							net.Start("Infection_LastMan")
 							net.Send(v)
@@ -307,7 +309,7 @@ if CLIENT then
 
 	local function InfectionHUDName()
 		if GetGlobalBool("GM_INFECTION") then
-			local team = LocalPlayer():GetNW2Bool("Infected") and "(Infected)" or "(Human)"
+			local team = LocalPlayer():GetNW2Bool("Infected") and language.GetPhrase("beatrun.infection.infectedtext") or language.GetPhrase("beatrun.infection.humantext")
 
 			return "Infection " .. team
 		else
@@ -371,13 +373,13 @@ if CLIENT then
 		noclipkey = input.GetKeyCode(noclipbind)
 		endtime = 0
 
-		Infection_StartTime = start + 10
+		Infection_StartTime = start + startTime:GetInt()
-		Infection_EndTime = start + 190
+		Infection_EndTime = start + gameTime:GetInt()
 
 		hook.Add("BeatrunHUDCourse", "InfectionHUDName", InfectionHUDName)
 		hook.Add("CalcView", "InfectionCalcView", InfectionCalcView)
 
-		chat.AddText(chatcolor, "Infection! Touch other players to infect them\n", math.max(math.floor(player.GetCount() / 4), 1) .. " player(s) will become infected in 10s")
+		chat.AddText(chatcolor, language.GetPhrase("beatrun.infection.start"):format(math.max(math.floor(player.GetCount() / 4), 1), startTime:GetInt()))
 	end)
 
 	local music = nil
@@ -400,12 +402,12 @@ if CLIENT then
 			survivors = survivors:sub(1, -3)
 
 			if survivors == "" then
-				survivors = "None..."
+				survivors = language.GetPhrase("beatrun.infection.nosurvivors")
 
 				LocalPlayer():EmitSound("death.wav")
 			end
 
-			chat.AddText(chatcolor, "The game has ended!\nSurvivors: " .. survivors .. "\nRestarting in 15s")
+			chat.AddText(chatcolor, language.GetPhrase("beatrun.infection.end"):format(survivors, _time))
 		end)
 
 		if music and music.Stop then
@@ -433,9 +435,9 @@ if CLIENT then
 
 		if IsValid(attacker) and IsValid(victim) then
 			if attacker == victim then
-				chat.AddText(attacker, red, " died!")
+				chat.AddText(attacker, red, " " .. language.GetPhrase("beatrun.infection.infected"))
 			else
-				chat.AddText(attacker, red, " has infected ", yellow, victim, "!")
+				chat.AddText(attacker, red, " " .. language.GetPhrase("beatrun.infection.infectedby") .. " ", yellow, victim, "!")
 			end
 
 			attacker.InfectionTouchDelay = CurTime() + 3
@@ -498,10 +500,10 @@ if CLIENT then
 
 		if humanwin then
 			LocalPlayer():AddXP(200)
-			chat.AddText(chatcolor, "You were awarded 200 XP for surviving")
+			chat.AddText(chatcolor, language.GetPhrase("beatrun.infection.award"))
 		else
 			LocalPlayer():AddXP(100)
-			chat.AddText(chatcolor, "You were awarded 100 XP for spawning as an infected")
+			chat.AddText(chatcolor, language.GetPhrase("beatrun.infection.awardinfected"))
 		end
 	end)
 

beatrun/gamemodes/beatrun/gamemode/sh/Ladder.lua

@@ -36,7 +36,7 @@ local function LadderCheck(ply, mv, cmd, ladder)
 		ply:SendLua("BodyAnimSetEase(LocalPlayer():GetNW2Vector('SPBAEase'))")
 	end
 
-	if CLIENT_IFTP() then
+	if CLIENT and IsFirstTimePredicted() then
 		local ang = ply:EyeAngles()
 		ang.y = ladder:GetAngles().y - 180
 		ang.x = 0
@@ -141,7 +141,7 @@ local function LadderThink(ply, mv, cmd, ladder)
 	elseif ply.LadderDown and ply:GetLadderDelay() < CurTime() then
 		ply.LadderDown = false
 
-		if CLIENT_IFTP() then
+		if CLIENT and IsFirstTimePredicted() then
 			ply:CLViewPunch(Angle(5, 0, 0))
 			BodyAnim:SetSequence("ladderclimbuprighthandstill")
 		elseif game.SinglePlayer() then
@@ -233,7 +233,7 @@ local function LadderThink(ply, mv, cmd, ladder)
 		mv:SetOrigin(newpos)
 		mv:SetVelocity(vector_origin)
 
-		if CLIENT_IFTP() then
+		if CLIENT and IsFirstTimePredicted() then
 			BodyAnim:SetSequence("jumpfast")
 		elseif game.SinglePlayer() then
 			ply:SendLua("BodyAnim:SetSequence('jumpfast')")