From: Samual <samual@xonotic.org>
Date: Fri, 30 Sep 2011 04:52:02 +0000 (-0400)
Subject: Move g_maxpushtime to balance config files -- It certainly is relevant to weapon... 
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7397e3d07377bd1ef5005d40942b99df0beb36e3;p=xonotic%2Fxonotic-data.pk3dir.git

Move g_maxpushtime to balance config files -- It certainly is relevant to weapon balance, and i'd like to change its values
---

diff --git a/balance25.cfg b/balance25.cfg
index 12c56c907..4e21074ff 100644
--- 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 2ec1c23bf..cf5622c20 100644
--- 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 3c9749c36..242a1ae7b 100644
--- 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 63f084317..b14ff5d05 100644
--- 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 07b35e2ee..778f2f410 100644
--- 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 a0d50e3e7..8125db4ec 100644
--- 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