make damage multiplier while dropping from dropship configurable

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 907fc13cc0d97b01527fa64e1727a763e6f0ff9a..8baf1142703a6e4386bf7ba67939f6eb11fff92b 100644 (file)
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -580,8 +580,8 @@ set g_br_minplayers 2 "minimum players to start the BR match"
 set g_br_squad_size 3 "maximum squad size"
 set g_br_squad_colors 1 "assign each squad a random color scheme and force players to use it"
 set g_br_startweapons 0 "when disabled, players land from the dropship without weapons"
-set g_br_bleed 0.02 "amount of health rot when injured"
-set g_br_bleedlinear 1 "linear amount of health rot when injured"
+set g_br_bleed 0.02 "amount of health rot while injured"
+set g_br_bleedlinear 1 "linear amount of health rot while injured"
 set g_br_bleeding_health 0.5 "start health mutliplier when injured"
 set g_br_revive_speed 0.4 "Speed for reviving an injured squadmate"
 set g_br_revive_clearspeed 1.6 "Speed at which reviving progress gets lost when out of range"
@@ -590,7 +590,8 @@ set g_br_revive_health 0.25 "start health multiplier when revived"
 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 200 "dropship speed"
-set g_br_drop_speed_max 2 "max air speed multiplier when dropping"
+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_horizontal_max 0.9 "maximum horizontal speed portion while dropping"
 set g_br_drop_speed_horizontal_min 0.5 "minimum horizontal speed portion while dropping"
 set g_br_drop_speed_vertical 1.5 "vertical speed mutliplier while dropping"

diff --git a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
index 2a84d6e9512337faf7c3d707f4b575831443e5ae..c2c63dcd3730746ab50bd449aa0375fb3d957348 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
+++ b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
@@ -34,6 +34,7 @@ bool squads_colored = false;
 
 float autocvar_g_br_revive_health = 0.25;
 float autocvar_g_br_bleeding_health = 0.5;
+float autocvar_g_br_drop_damage = 0.5;
 float autocvar_g_br_drop_speed_max = 2;
 float autocvar_g_br_drop_speed_horizontal_max = 0.9;
 float autocvar_g_br_drop_speed_horizontal_min = 0.5;
@@ -519,8 +520,8 @@ MUTATOR_HOOKFUNCTION(br, Damage_Calculate)
                     break;
                 default:
                     // only take half of the usual damage
-                    M_ARGV(4, float) /= 2;
-                    M_ARGV(5, float) /= 2;
+                    M_ARGV(4, float) *= max(autocvar_g_br_drop_damage, 0);
+                    M_ARGV(5, float) *= max(autocvar_g_br_drop_damage, 0);
             }
         }
     }