X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=balanceSamual.cfg;h=75fa37b3763d6440d7823007c2b79d929a996ac1;hb=74d1c4edf5730087d9d7206d2dea3b07f66d4f76;hp=4e3733a7551d38076e00f50e63a4f286813981f9;hpb=2c5f7f2b33fb403cbd719696cd42e6544318d79b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 4e3733a75..75fa37b37 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -56,16 +56,16 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 1
 set g_pickup_weapons_anyway 1
 set g_pickup_shells 15
-set g_pickup_shells_weapon 30
+set g_pickup_shells_weapon 15
 set g_pickup_shells_max 90
 set g_pickup_nails 80
-set g_pickup_nails_weapon 160
+set g_pickup_nails_weapon 80
 set g_pickup_nails_max 320
 set g_pickup_rockets 40
-set g_pickup_rockets_weapon 80
+set g_pickup_rockets_weapon 40
 set g_pickup_rockets_max 160
 set g_pickup_cells 50
-set g_pickup_cells_weapon 100
+set g_pickup_cells_weapon 50
 set g_pickup_cells_max 200
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
@@ -214,7 +214,7 @@ set g_balance_grapplehook_health 130
 // {{{ laser
 set g_balance_laser_primary_damage 25
 set g_balance_laser_primary_edgedamage 12.5
-set g_balance_laser_primary_force 200
+set g_balance_laser_primary_force 175
 set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 6000
 set g_balance_laser_primary_spread 0
@@ -222,7 +222,7 @@ 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.03
+set g_balance_laser_primary_delay 0
 set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 2 // 350 upforce
 set g_balance_laser_primary_force_velocitybias 0.3
@@ -271,10 +271,10 @@ set g_balance_uzi_spread_max 0.1
 set g_balance_uzi_spread_add 0.012
 
 set g_balance_uzi_burst 3				// # of bullets in a burst (if set to 2 or more)
-set g_balance_uzi_burst_animtime 0.75
-set g_balance_uzi_burst_refire 0.075		// refire between burst bullets
+set g_balance_uzi_burst_animtime 0.3
+set g_balance_uzi_burst_refire 0.06		// refire between burst bullets
 set g_balance_uzi_burst_refire2 0.75	// refire after burst
-set g_balance_uzi_burst_spread 0.04
+set g_balance_uzi_burst_spread 0.03
 set g_balance_uzi_burst_damage 25		
 set g_balance_uzi_burst_force 20
 set g_balance_uzi_burst_ammo 3
@@ -383,9 +383,9 @@ set g_balance_electro_secondary_speed 900
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0.05
-set g_balance_electro_secondary_lifetime 2.5
+set g_balance_electro_secondary_lifetime 3
 set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1
+set g_balance_electro_secondary_refire2 1.25
 set g_balance_electro_secondary_animtime 0.2
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
@@ -416,11 +416,11 @@ set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0
 set g_balance_crylink_primary_joinspread 0.4
 set g_balance_crylink_primary_jointime 0
-set g_balance_crylink_primary_joinexplode 0
-set g_balance_crylink_primary_joinexplode_damage 50
+set g_balance_crylink_primary_joinexplode 1
+set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
-set g_balance_crylink_primary_joinexplode_radius 200
-set g_balance_crylink_primary_joinexplode_force 300
+set g_balance_crylink_primary_joinexplode_radius 0
+set g_balance_crylink_primary_joinexplode_force 0
 set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000