X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=balanceFruit.cfg;h=9ef7ab1f87479141b2cd63ebd93a5d136e9716ec;hb=96c3280cdcffff9511c8c99c62ed522ae0481f4d;hp=5275fd1bead9bcdfb0509638159d37842637b54f;hpb=85fa566de872b5d7956e0b505c040ee96aac3a3b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 5275fd1be..9ef7ab1f8 100644
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -33,7 +33,7 @@ set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_lms_start_health 250
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 30
-set g_lms_start_ammo_nails 300
+set g_lms_start_ammo_nails 250
 set g_lms_start_ammo_rockets 100
 set g_lms_start_ammo_cells 200
 set g_lms_start_ammo_fuel 0
@@ -58,7 +58,7 @@ set g_pickup_shells 10
 set g_pickup_shells_max 30
 set g_pickup_nails 120
 set g_pickup_nails_max 300
-set g_pickup_rockets 15
+set g_pickup_rockets 25
 set g_pickup_rockets_max 150
 set g_pickup_cells 25
 set g_pickup_cells_max 200
@@ -210,11 +210,11 @@ set g_balance_laser_primary_damage 30 // dps 50, hope that's not too high
 set g_balance_laser_primary_edgedamage 30
 set g_balance_laser_primary_force 235
 set g_balance_laser_primary_radius 70
-set g_balance_laser_primary_speed 2000
+set g_balance_laser_primary_speed 9000
 set g_balance_laser_primary_spread 0
 set g_balance_laser_primary_refire 0.6
 set g_balance_laser_primary_animtime 0.6
-set g_balance_laser_primary_lifetime 30
+set g_balance_laser_primary_lifetime 5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
 set g_balance_laser_gauntlet 0
@@ -223,11 +223,11 @@ set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
 set g_balance_laser_secondary_force 400
 set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 9000
+set g_balance_laser_secondary_speed 4500
 set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
 set g_balance_laser_secondary_animtime 0.3
-set g_balance_laser_secondary_lifetime 30
+set g_balance_laser_secondary_lifetime 5
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
@@ -245,7 +245,8 @@ set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_melee 1
 set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 set g_balance_shotgun_secondary_melee_range 60
-set g_balance_shotgun_secondary_melee_size 50
+set g_balance_shotgun_secondary_melee_swing 50
+set g_balance_shotgun_secondary_melee_time 0.1
 set g_balance_shotgun_secondary_bullets 6 // one more per shot than 15/3 (primary bullets/amount of shots = 3)
 set g_balance_shotgun_secondary_damage 115
 set g_balance_shotgun_secondary_force 150
@@ -309,10 +310,10 @@ set g_balance_grenadelauncher_secondary_bouncestop 0.075
 set g_balance_electro_lightning 1
 set g_balance_electro_primary_damage 100
 set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 800
+set g_balance_electro_primary_force 600
 set g_balance_electro_primary_force_up 125
 set g_balance_electro_primary_radius 850
-set g_balance_electro_primary_comboradius 80
+set g_balance_electro_primary_comboradius 75
 set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
@@ -320,29 +321,29 @@ set g_balance_electro_primary_refire 0.03333333
 set g_balance_electro_primary_animtime 0.03333333
 set g_balance_electro_primary_ammo 6
 set g_balance_electro_primary_range 800
-set g_balance_electro_secondary_damage 45
+set g_balance_electro_secondary_damage 40
 set g_balance_electro_secondary_spread 0
 set g_balance_electro_secondary_edgedamage 0
 set g_balance_electro_secondary_force 100
 set g_balance_electro_secondary_radius 100
-set g_balance_electro_secondary_speed 600
+set g_balance_electro_secondary_speed 500
 set g_balance_electro_secondary_speed_up 0
-set g_balance_electro_secondary_speed_z 200
+set g_balance_electro_secondary_speed_z 300
 set g_balance_electro_secondary_spread 0.08
 set g_balance_electro_secondary_lifetime 3.5
-set g_balance_electro_secondary_refire 0.7
+set g_balance_electro_secondary_refire 0.5
 set g_balance_electro_secondary_refire2 0
-set g_balance_electro_secondary_animtime 0.7
+set g_balance_electro_secondary_animtime 0.5
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 3
-set g_balance_electro_combo_damage 45
+set g_balance_electro_secondary_count 1
+set g_balance_electro_combo_damage 40
 set g_balance_electro_combo_edgedamage 0
-set g_balance_electro_combo_force 150
+set g_balance_electro_combo_force 80
 set g_balance_electro_combo_radius 250
 set g_balance_electro_combo_comboradius 0
-set g_balance_electro_combo_speed 2000
+set g_balance_electro_combo_speed 400
 // }}}
 // {{{ crylink
 set g_balance_crylink_primary_damage 12
@@ -407,7 +408,7 @@ set g_balance_hagar_primary_force 70
 set g_balance_hagar_primary_radius 70
 set g_balance_hagar_primary_spread 0.1
 set g_balance_hagar_primary_speed 1800
-set g_balance_hagar_primary_lifetime 30
+set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.12
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
@@ -417,7 +418,7 @@ set g_balance_hagar_secondary_force 70
 set g_balance_hagar_secondary_radius 50
 set g_balance_hagar_secondary_spread 0.15
 set g_balance_hagar_secondary_speed 1800
-set g_balance_hagar_secondary_lifetime_min 30
+set g_balance_hagar_secondary_lifetime_min 5
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.12
 set g_balance_hagar_secondary_ammo 1
@@ -430,7 +431,7 @@ set g_balance_rocketlauncher_radius 100
 set g_balance_rocketlauncher_speed 1000
 set g_balance_rocketlauncher_speedaccel 0
 set g_balance_rocketlauncher_speedstart 1000
-set g_balance_rocketlauncher_lifetime 30
+set g_balance_rocketlauncher_lifetime 5
 set g_balance_rocketlauncher_refire 1
 set g_balance_rocketlauncher_animtime 0.2
 set g_balance_rocketlauncher_ammo 3
@@ -456,7 +457,7 @@ set g_balance_rocketlauncher_remote_force 350
 set g_balance_porto_primary_refire 1.5
 set g_balance_porto_primary_animtime 0.3
 set g_balance_porto_primary_speed 2000
-set g_balance_porto_primary_lifetime 30
+set g_balance_porto_primary_lifetime 5
 set g_balance_portal_health 200 // these get recharged whenever the portal is used
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
@@ -472,7 +473,7 @@ set g_balance_hook_secondary_edgedamage 5 // not much
 set g_balance_hook_secondary_radius 500 // LOTS
 set g_balance_hook_secondary_force -2000 // LOTS
 set g_balance_hook_secondary_ammo 50 // a whole pack
-set g_balance_hook_secondary_lifetime 30 // infinite
+set g_balance_hook_secondary_lifetime 5 // infinite
 set g_balance_hook_secondary_speed 0 // not much throwing
 set g_balance_hook_secondary_gravity 5 // fast falling
 set g_balance_hook_secondary_refire 3 // don't drop too many bombs...
@@ -514,25 +515,26 @@ set g_balance_hlac_secondary_ammo 10
 set g_balance_hlac_secondary_shots 6
 // }}}
 // {{{ campingrifle
-set g_balance_campingrifle_magazinecapacity 8
+set g_balance_campingrifle_magazinecapacity 0
 set g_balance_campingrifle_reloadtime 2 // matches reload anim
 set g_balance_campingrifle_auto_reload_after_changing_weapons 0
 set g_balance_campingrifle_bursttime 0
 set g_balance_campingrifle_tracer 1
-set g_balance_campingrifle_primary_damage 60
-set g_balance_campingrifle_primary_headshotaddeddamage 100
+set g_balance_campingrifle_primary_damage 50
+set g_balance_campingrifle_primary_headshotaddeddamage 35
 set g_balance_campingrifle_primary_spread 0
 set g_balance_campingrifle_primary_force 2
 set g_balance_campingrifle_primary_speed 35000
 set g_balance_campingrifle_primary_lifetime 5
 set g_balance_campingrifle_primary_refire 0.8
-set g_balance_campingrifle_primary_animtime 0.3
+set g_balance_campingrifle_primary_animtime 0.8
 set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0
 set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
-set g_balance_campingrifle_secondary_damage 35
-set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head
+set g_balance_campingrifle_secondary 0
+set g_balance_campingrifle_secondary_damage 15
+set g_balance_campingrifle_secondary_headshotaddeddamage 25 // 50 damage only on head
 set g_balance_campingrifle_secondary_spread 0.008
 set g_balance_campingrifle_secondary_force 1
 set g_balance_campingrifle_secondary_speed 20000