Move g_maxpushtime to balance config files -- It certainly is relevant to weapon...

diff --git a/balance25.cfg b/balance25.cfg
index 12c56c9078b2a86c57417f161a4b94000406182e..4e21074ff0fd3f794978ad45dd7bb2a9c4b44bec 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -192,6 +192,7 @@ set g_balance_contents_playerdamage_drowning 20 // damage per second for while p
 set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
 set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
 set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
+set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 // }}}
 
 // {{{ powerups

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 2ec1c23bf1be6585b1b3b66f2936df26cb3e6e7c..cf5622c209bfd99020908ac8e103709af33ed238 100644 (file)
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -192,6 +192,7 @@ set g_balance_contents_playerdamage_drowning 20 // damage per second for while p
 set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
 set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
 set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
+set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 // }}}
 
 // {{{ powerups

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 3c9749c36900519b6c39b286bfcdeee899e2b809..242a1ae7bea1860eb3927ce5f9fba157070b80eb 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -192,6 +192,7 @@ set g_balance_contents_playerdamage_drowning 20 // damage per second for while p
 set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
 set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
 set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
+set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 // }}}
 
 // {{{ powerups

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 63f084317a083df87a9fd7a5ff90b9d56199868b..b14ff5d0502b580e3b1afa82c59d4bc4e1525e37 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -192,6 +192,7 @@ set g_balance_contents_playerdamage_drowning 20 // damage per second for while p
 set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
 set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
 set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
+set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 // }}}
 
 // {{{ powerups

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 07b35e2ee198a3ae0ab0863db0ca5e97e2e9413e..778f2f410810a323a76785c0713b81e904f6d185 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -192,6 +192,7 @@ set g_balance_contents_playerdamage_drowning 20 // damage per second for while p
 set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
 set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
 set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
+set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 // }}}
 
 // {{{ powerups

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index a0d50e3e7a996bf234d765d634097f23d5b2357e..8125db4ecbaa149f0e9436df5c1a604e2ad5f767 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -535,7 +535,6 @@ seta g_maplist_selectrandom 0       "if 1, a random map will be chosen as next map - D
 seta g_maplist_shuffle 1       "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
 set g_maplist_check_waypoints 0        "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
 set samelevel 0 "when 1, always play the same level over and over again"
-set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
 
 set g_cloaked 0 "display all players mostly invisible"
 set g_player_alpha 1