From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 25 Jun 2010 18:43:06 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~75
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8a13a6d2d6e42485015dee9c1c910e6ed9b46cdf

Merge branch 'master' into fruitiex/fruitbalance

Conflicts:
	balance.cfg
---

8a13a6d2d6e42485015dee9c1c910e6ed9b46cdf
diff --cc balance.cfg
index 8c53158927,156b69aed5..e824e271ba
--- a/balance.cfg
+++ b/balance.cfg
@@@ -269,8 -269,7 +269,8 @@@ set g_balance_uzi_bulletconstant 115 /
  // }}}
  // {{{ mortar
  set g_balance_grenadelauncher_primary2secondary 0
 +set g_balance_grenadelauncher_primary_sticky 0
- set g_balance_grenadelauncher_primary_damage 50
+ set g_balance_grenadelauncher_primary_damage 70
  set g_balance_grenadelauncher_primary_edgedamage 38
  set g_balance_grenadelauncher_primary_force 400
  set g_balance_grenadelauncher_primary_radius 140
@@@ -283,8 -281,7 +283,8 @@@ set g_balance_grenadelauncher_primary_l
  set g_balance_grenadelauncher_primary_refire 0.8
  set g_balance_grenadelauncher_primary_animtime 0.3
  set g_balance_grenadelauncher_primary_ammo 2
 +set g_balance_grenadelauncher_primary_health 25
- set g_balance_grenadelauncher_secondary_damage 60
+ set g_balance_grenadelauncher_secondary_damage 70
  set g_balance_grenadelauncher_secondary_edgedamage 38
  set g_balance_grenadelauncher_secondary_force 400
  set g_balance_grenadelauncher_secondary_radius 140