Merge branch 'martin-t/shield' into 'master'

Make shield reduce force as well (unless selfpush)

See merge request xonotic/xonotic-data.pk3dir!526

diff --git a/balance-mario.cfg b/balance-mario.cfg
index 111a2747408736191046832454e040d31b3f7574..4dda8bdc8842318701f1dcc39e95db6a87f8f7c3 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 1
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index d5365d2843b204a4860ffd52bb843107e67781d6..73c63df9b7277014a78e9be149afa5dd222e9a23 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.2
+set g_balance_powerup_invincible_takeforce 1
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 4

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index eb1fd6b6e352b7e6e73c688e5ddec80902f83e2c..bf2ecc623cccf3ebd3fba2cc0afecb2ec7432e40 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/balance-samual.cfg b/balance-samual.cfg
index 653881a681e7b40a2ecd9656db8a9b508453181d..9bcb976b60853f8dda7a81c66d22806766eaac02 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.25 // only 1/4th damage is taken
+set g_balance_powerup_invincible_takeforce 1
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 952abd9bc72710f7cecb935619ebeed96f4c5d07..245fa7cc4cd06cdc0a8eabcf5ac346fc8190a5a7 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index 2b9d38ca95fce1fa32a28957f06328a0491f0e9c..e19872454fa57d9b9cdfdd77ac6319763f390432 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 76d75bfbed9ffdff603450f669eec4fb17b15af2..5b8c67d2f5f9395af13f8fadde4a28c613a930e8 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -199,6 +199,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 847573135eae56c16039a00deb621b3c3d1f548b..a2f917fafcaee15b204ce9cc80eb1455ce89dc38 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -79,6 +79,7 @@ float autocvar_g_balance_pause_health_rot_spawn;
 float autocvar_g_balance_portal_health;
 float autocvar_g_balance_portal_lifetime;
 float autocvar_g_balance_powerup_invincible_takedamage;
+float autocvar_g_balance_powerup_invincible_takeforce = 0.33;
 //float autocvar_g_balance_powerup_invincible_time;
 float autocvar_g_balance_powerup_strength_damage;
 float autocvar_g_balance_powerup_strength_force;

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 029660c2bf05c2e98975f609e8c35d943d4f168d..75bf81f8a6c99ecc6ccea2b61dd767d2085e30a4 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -800,7 +800,13 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 
                        // apply invincibility multiplier
                        if (targ.items & ITEM_Shield.m_itemid)
+                       {
                                damage = damage * autocvar_g_balance_powerup_invincible_takedamage;
+                               if (targ != attacker)
+                               {
+                                       force = force * autocvar_g_balance_powerup_invincible_takeforce;
+                               }
+                       }
                }
 
                if (targ == attacker)