From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 28 Jan 2022 16:31:10 +0000 (+0100)
Subject: client side swim prevention for knocked down players and slight cvar default adjustme... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f1845ba7e729ad6bb53075209a541061a8f0355;p=xonotic%2Fxonotic-data.pk3dir.git

client side swim prevention for knocked down players and slight cvar default adjustment in battle royale
---

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 943d76c5c..8f54e796e 100644
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -593,7 +593,7 @@ set g_br_dropship_color "0.5 0 0.5" "dropship color"
 set g_br_dropship_scale 3 "dropship scale"
 set g_br_dropship_speed -1 "dropship speed, -1 to decide based on map size"
 set g_br_drop_damage 0.5 "multiplier of damage taken while dropping"
-set g_br_drop_speed_max 2 "max air speed multiplier while dropping"
+set g_br_drop_speed_max 2.5 "max air speed multiplier while dropping"
 set g_br_drop_speed_min 1.25 "min air speed multiplier while dropping"
 set g_br_drop_speed_vertical_min 0.1 "minimum vertical speed portion while dropping"
 set g_br_drop_accel_dive 50 "dive acceleration while dropping"
diff --git a/qcsrc/common/gamemodes/gamemode/br/cl_br.qc b/qcsrc/common/gamemodes/gamemode/br/cl_br.qc
index 25be8d286..2310cdfd4 100644
--- a/qcsrc/common/gamemodes/gamemode/br/cl_br.qc
+++ b/qcsrc/common/gamemodes/gamemode/br/cl_br.qc
@@ -39,6 +39,14 @@ MUTATOR_HOOKFUNCTION(cl_br, PM_Physics)
     if(STAT(DROP) == DROP_FALLING)
         ITEMS_STAT(csqcplayer) |= IT_USING_JETPACK;
 
+    // injured players can't swim
+    if(STAT(BLEEDING)){
+        if(csqcplayer.waterlevel >= WATERLEVEL_SWIMMING)
+        {
+            csqcplayer.com_in_jump = false;
+        }
+    }
+
     return (STAT(DROP) != DROP_LANDED);
 }
 
diff --git a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
index b50d751c0..26496511b 100644
--- a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
+++ b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
@@ -42,7 +42,7 @@ float autocvar_g_br_revive_health = 0.25;
 float autocvar_g_br_bleeding_health = 0.5;
 float autocvar_g_br_bleeding_armor = 50;
 float autocvar_g_br_drop_damage = 0.5;
-float autocvar_g_br_drop_speed_max = 2;
+float autocvar_g_br_drop_speed_max = 2.5;
 float autocvar_g_br_drop_speed_min = 1.25;
 float autocvar_g_br_drop_speed_vertical_min = 0.1;
 bool autocvar_g_br_squad_colors = true;