X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=balanceFruit.cfg;h=ac93a59d07ffa9f5bbd965401adb9c656476db1d;hb=94484151805d7d493b1932e5dfaf976ddbe3fd21;hp=b09fc45fbc7412667708927e76f6b3e988217809;hpb=99ab756478d813695913e72b5ac033eaee78d0d0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index b09fc45fb..ac93a59d0 100644
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -206,18 +206,18 @@ set g_balance_grapplehook_health 130
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_primary_damage 10
-set g_balance_laser_primary_edgedamage 0
-set g_balance_laser_primary_force 75
-set g_balance_laser_primary_radius 10
-set g_balance_laser_primary_speed 0
+set g_balance_laser_primary_damage 35
+set g_balance_laser_primary_edgedamage 10
+set g_balance_laser_primary_force 400
+set g_balance_laser_primary_radius 70
+set g_balance_laser_primary_speed 9000
 set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_refire 0.066
-set g_balance_laser_primary_animtime 0.066
-set g_balance_laser_primary_lifetime 0
+set g_balance_laser_primary_refire 0.7
+set g_balance_laser_primary_animtime 0.3
+set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
-set g_balance_laser_primary_delay 0
-set g_balance_laser_gauntlet 1
+set g_balance_laser_primary_delay 0.03
+set g_balance_laser_gauntlet 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
@@ -226,7 +226,7 @@ set g_balance_laser_secondary_radius 70
 set g_balance_laser_secondary_speed 9000
 set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
-set g_balance_laser_secondary_animtime 0
+set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
@@ -259,7 +259,7 @@ set g_balance_uzi_first_force 35
 set g_balance_uzi_first_spread 0.03
 set g_balance_uzi_first_refire 0.2
 set g_balance_uzi_first_ammo 2
-set g_balance_uzi_sustained_damage 10
+set g_balance_uzi_sustained_damage 8
 set g_balance_uzi_sustained_force 7.5
 set g_balance_uzi_sustained_spread 0.1
 set g_balance_uzi_sustained_refire 0.075
@@ -273,13 +273,13 @@ set g_balance_grenadelauncher_primary_sticky 1
 set g_balance_grenadelauncher_primary_damage 100
 set g_balance_grenadelauncher_primary_edgedamage 30
 set g_balance_grenadelauncher_primary_force 300
-set g_balance_grenadelauncher_primary_radius 240
+set g_balance_grenadelauncher_primary_radius 200
 set g_balance_grenadelauncher_primary_speed 1000
 set g_balance_grenadelauncher_primary_speed_up 0
 set g_balance_grenadelauncher_primary_speed_z 200
 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_lifetime2 0.8
 set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.2
 set g_balance_grenadelauncher_primary_ammo 2
@@ -303,20 +303,20 @@ set g_balance_grenadelauncher_secondary_bouncestop 0.075
 // }}}
 // {{{ electro // TODO
 set g_balance_electro_lightning 1
-set g_balance_electro_primary_damage 2
+set g_balance_electro_primary_damage 120
 set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 13
-set g_balance_electro_primary_force_up 100
+set g_balance_electro_primary_force 780
+set g_balance_electro_primary_force_up 6000
 set g_balance_electro_primary_radius 850
 set g_balance_electro_primary_comboradius 0
 set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
 set g_balance_electro_primary_refire 0
-set g_balance_electro_primary_animtime 0
-set g_balance_electro_primary_ammo 0.66
+set g_balance_electro_primary_animtime 0.05
+set g_balance_electro_primary_ammo 40
 set g_balance_electro_primary_range 800
-set g_balance_electro_primary_velocityfactor 0.75
+set g_balance_electro_primary_velocityfactor 45
 set g_balance_electro_secondary_damage 50
 set g_balance_electro_secondary_spread 0.05
 set g_balance_electro_secondary_edgedamage 0
@@ -342,8 +342,8 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 2000
 // }}}
 // {{{ crylink
-set g_balance_crylink_primary_damage 10
-set g_balance_crylink_primary_edgedamage 0
+set g_balance_crylink_primary_damage 12
+set g_balance_crylink_primary_edgedamage 10
 set g_balance_crylink_primary_force 25
 set g_balance_crylink_primary_radius 100
 set g_balance_crylink_primary_speed 1100
@@ -423,7 +423,7 @@ set g_balance_hagar_secondary_ammo 1
 set g_balance_rocketlauncher_damage 100
 set g_balance_rocketlauncher_edgedamage 33
 set g_balance_rocketlauncher_force 350
-set g_balance_rocketlauncher_radius 120
+set g_balance_rocketlauncher_radius 100
 set g_balance_rocketlauncher_speed 1000
 set g_balance_rocketlauncher_speedaccel 0
 set g_balance_rocketlauncher_speedstart 1000