Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index b217b3376a3232689ce906c42ea2dfb52ad08246..f5e47e67f11c4fad3e121de8046217e89d9ba26d 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -592,11 +592,11 @@ set g_balance_hagar_reload_time 2
 // {{{ rocketlauncher
 set g_balance_rocketlauncher_damage 80
 set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 500
-set g_balance_rocketlauncher_radius 120
-set g_balance_rocketlauncher_speed 1200
-set g_balance_rocketlauncher_speedaccel 1200
-set g_balance_rocketlauncher_speedstart 1200
+set g_balance_rocketlauncher_force 400
+set g_balance_rocketlauncher_radius 110
+set g_balance_rocketlauncher_speed 1300
+set g_balance_rocketlauncher_speedaccel 1300
+set g_balance_rocketlauncher_speedstart 1000
 set g_balance_rocketlauncher_lifetime 10
 set g_balance_rocketlauncher_refire 1.1
 set g_balance_rocketlauncher_animtime 0.35

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 0fe2c125387d26a64bfce35298b3092f270091e3..05287f5b56ff5730ad582346534ff6745437d7bf 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -334,7 +334,7 @@ set g_balance_grenadelauncher_primary_radius 120
 set g_balance_grenadelauncher_primary_speed 1900
 set g_balance_grenadelauncher_primary_speed_up 225
 set g_balance_grenadelauncher_primary_speed_z 0
-set g_balance_grenadelauncher_primary_spread 0.02
+set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 5
 set g_balance_grenadelauncher_primary_lifetime2 1
 set g_balance_grenadelauncher_primary_refire 0.8
@@ -352,7 +352,7 @@ set g_balance_grenadelauncher_secondary_radius 120
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 150
 set g_balance_grenadelauncher_secondary_speed_z 0
-set g_balance_grenadelauncher_secondary_spread 0.05
+set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 5
 set g_balance_grenadelauncher_secondary_lifetime_bounce 0.5
 set g_balance_grenadelauncher_secondary_lifetime_stick 0
@@ -592,11 +592,11 @@ set g_balance_hagar_reload_time 2
 // {{{ rocketlauncher
 set g_balance_rocketlauncher_damage 80
 set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 500
-set g_balance_rocketlauncher_radius 120
-set g_balance_rocketlauncher_speed 1200
-set g_balance_rocketlauncher_speedaccel 1200
-set g_balance_rocketlauncher_speedstart 1200
+set g_balance_rocketlauncher_force 400
+set g_balance_rocketlauncher_radius 110
+set g_balance_rocketlauncher_speed 1300
+set g_balance_rocketlauncher_speedaccel 1300
+set g_balance_rocketlauncher_speedstart 1000
 set g_balance_rocketlauncher_lifetime 10
 set g_balance_rocketlauncher_refire 1.1
 set g_balance_rocketlauncher_animtime 0.35