From: Mario <mario@smbclan.net>
Date: Fri, 9 Aug 2019 02:05:41 +0000 (+1000)
Subject: Add an option to configure the damage force players take from attacks
X-Git-Tag: xonotic-v0.8.5~1425
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4be97470a752f2696c2f6938a926681c37093316;p=xonotic%2Fxonotic-data.pk3dir.git

Add an option to configure the damage force players take from attacks
---

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 4d33e9b52..4b71e28e8 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -180,6 +180,7 @@ float autocvar_g_items_maxdist;
 int autocvar_g_pickup_items;
 float autocvar_g_player_alpha;
 float autocvar_g_player_brightness;
+float autocvar_g_player_damageforcescale = 2;
 bool autocvar_g_playerclip_collisions;
 int autocvar_g_powerups;
 int autocvar_g_projectiles_damage;
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 3afa06d12..f43785bbb 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -604,7 +604,7 @@ void PutPlayerInServer(entity this)
 		this.pauseregen_finished += f;
 	}
 
-	this.damageforcescale = 2;
+	this.damageforcescale = autocvar_g_player_damageforcescale;
 	this.death_time = 0;
 	this.respawn_flags = 0;
 	this.respawn_time = 0;
diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 9613e7e77..d261e262e 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -222,6 +222,7 @@ set g_grab_range 200 "distance at which dragable objects can be grabbed"
 set g_cloaked 0 "display all players mostly invisible"
 set g_player_alpha 1 "default opacity of players"
 set g_player_brightness 0	"set to 2 for brighter players"
+set g_player_damageforcescale 2 "push multiplier of attacks against players"
 set g_balance_cloaked_alpha 0.25 "opacity of cloaked players"
 
 set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"