add a zscale cvar for laser force that allows scaling z force only. Currently tweaked...

diff --git a/balance25.cfg b/balance25.cfg
index 711bdfdead3832bede8bb60f635616352c8477b0..5db0f0ddbc91aa265d14d4bb50b51769572594b0 100644 (file)
--- 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_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
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 3dd00ebe178fa41bddddff9f455f30954b0e776f..593aa2d05d8d8a2465748bffbd1e920941c249f3 100644 (file)
--- 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_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
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 5

diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 8e8a892fbd4d00bbace236b4d8341ecdf407f6d1..54e4b823ca52ab7d8db084ebb7713d5caf6a2cd9 100644 (file)
--- 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_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
 // }}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 62f48fdca119b48e9e9d84fc5a25661865a6ef64..55c00c6ff23c1cfa6094584393da462f7d3b8459 100644 (file)
--- 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_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
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6

diff --git a/balanceTest.cfg b/balanceTest.cfg
index 45d1bc7c3a9025db8fa2bb3c565f99f0459442b8..0006eb704177d82e3c86365da7bd30ff50ae5879 100644 (file)
--- 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_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
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 10

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 42abb109e29fa1ec5d2223fff4479f8aafc905aa..96a46ecb2ab9487edcb8a3bfcd2624c96a2dfb2f 100644 (file)
--- 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_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
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 20

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 3733f246626e737a9e6594c8777defeee63f930e..942984786e277bfeaab84daefd6096c799244234 100644 (file)
--- 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_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
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 10

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 6f8c9490ef907175c088a5c51315dcaef1ce8f38..ef0224264ffd0bf74a109118ba852526f7809b77 100644 (file)
--- 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;
                                                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));
                                                //if (targ == attacker)
                                                //{
                                                //      print("hits ", ftos(hits), " / ", ftos(total));