From: FruitieX <fruitiex@gmail.com>
Date: Sun, 12 Dec 2010 10:53:24 +0000 (+0200)
Subject: Merge branch 'fruitiex/balance' into fruitiex/ctsfix
X-Git-Tag: xonotic-v0.1.0preview~51^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=7e2aacbe5ab40622c1bda6c64d34d852f4ad3cfb

Merge branch 'fruitiex/balance' into fruitiex/ctsfix

Conflicts:
	defaultXonotic.cfg
---

7e2aacbe5ab40622c1bda6c64d34d852f4ad3cfb
diff --cc defaultXonotic.cfg
index 1369075aa4,03882aeffd..51eff15108
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -616,20 -625,27 +625,27 @@@ set g_ca_damage2score_multiplier 0.0
  set g_ca_round_timelimit 180
  set g_nexball_respawn_delay 0
  set g_nexball_respawn_waves 0
+ set g_nexball_weapon_stay 0
  set g_as_respawn_delay 0
  set g_as_respawn_waves 0
+ set g_as_weapon_stay 1
  set g_ons_respawn_delay 0
  set g_ons_respawn_waves 0
+ set g_ons_weapon_stay 0
  set g_rc_respawn_waves 0
  set g_rc_respawn_delay 0
+ set g_rc_weapon_stay 0
  set g_cts_respawn_waves 0
 -set g_cts_respawn_delay 0.25
 +set g_cts_respawn_delay 0
  set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
  set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
+ set g_cts_weapon_stay 1
  set g_freezetag_respawn_waves 0
 -set g_freezetag_respawn_delay 0.25
 +set g_freezetag_respawn_delay 0
+ set g_freezetag_weapon_stay 1
  set g_ka_respawn_delay 0
  set g_ka_respawn_waves 0
+ set g_ka_weapon_stay 0
  
  // overtime
  seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"