From: FruitieX <fruitiex@gmail.com>
Date: Sat, 6 Nov 2010 21:23:45 +0000 (+0200)
Subject: add a zscale cvar for laser force that allows scaling z force only. Currently tweaked... 
X-Git-Tag: xonotic-v0.1.0preview~183^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be97a2d3620f910ccca9951eb9fc663872bc5b41;p=xonotic%2Fxonotic-data.pk3dir.git

add a zscale cvar for laser force that allows scaling z force only. Currently tweaked to closely match 300 force on the z-axis, no change for horizontal push because it was very good already.
---

diff --git a/balance25.cfg b/balance25.cfg
index 711bdfdea..5db0f0ddb 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -237,6 +237,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
+set g_balance_laser_force_zscale 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 3dd00ebe1..593aa2d05 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -248,6 +248,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
+set g_balance_laser_force_zscale 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 5
diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 8e8a892fb..54e4b823c 100644
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -237,6 +237,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
+set g_balance_laser_force_zscale 0
 // }}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 62f48fdca..55c00c6ff 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -237,6 +237,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
+set g_balance_laser_force_zscale 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
diff --git a/balanceTest.cfg b/balanceTest.cfg
index 45d1bc7c3..0006eb704 100644
--- a/balanceTest.cfg
+++ b/balanceTest.cfg
@@ -237,6 +237,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
+set g_balance_laser_force_zscale 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 10
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 42abb109e..96a46ecb2 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -237,6 +237,7 @@ set g_balance_laser_secondary_lifetime 0
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 1
+set g_balance_laser_force_zscale 1.25
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 20
diff --git a/balancetZork.cfg b/balancetZork.cfg
index 3733f2466..942984786 100644
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -237,6 +237,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
+set g_balance_laser_force_zscale 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 10
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 6f8c9490e..ef0224264 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -993,6 +993,10 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 						finaldmg = finaldmg * a;
 						a = bound(0, tfloorforce + (1-tfloorforce) * hitratio, 1);
 						force = force * a;
+
+						if(deathtype == WEP_LASER && cvar("g_balance_laser_force_zscale")) // scale laser push force on the z-axis
+							force_z = force_z * cvar("g_balance_laser_force_zscale");
+
 						//if (targ == attacker)
 						//{
 						//	print("hits ", ftos(hits), " / ", ftos(total));