X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=bal-wep-xonotic.cfg;h=320ce228047aa2d2b1838dccc9ec7b4c70f730ba;hp=0d4bf49e0555223ec6e25c10448cac769f7ce6be;hb=03cf23ac1571db6b12bea21b9818db15068ecc48;hpb=c2aaebd96fbcbd6bdee718e34b42a755e6755f4d

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 0d4bf49e0..320ce2280 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -35,16 +35,16 @@ set g_balance_blaster_weaponthrowable 0
 set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_bullets 14
-set g_balance_shotgun_primary_damage 4
+set g_balance_shotgun_primary_damage 3.5
 set g_balance_shotgun_primary_force 15
 set g_balance_shotgun_primary_refire 0.75
 set g_balance_shotgun_primary_solidpenetration 3.8
-set g_balance_shotgun_primary_spread 0.12
+set g_balance_shotgun_primary_spread 0.11
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_animtime 1
-set g_balance_shotgun_secondary_damage 80
+set g_balance_shotgun_secondary_damage 70
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
 set g_balance_shotgun_secondary_melee_multihit 1
@@ -56,6 +56,8 @@ set g_balance_shotgun_secondary_melee_swing_up 30
 set g_balance_shotgun_secondary_melee_time 0.15
 set g_balance_shotgun_secondary_melee_traces 10
 set g_balance_shotgun_secondary_refire 1.25
+set g_balance_shotgun_secondary_alt_animtime 0.2
+set g_balance_shotgun_secondary_alt_refire 1.2
 set g_balance_shotgun_switchdelay_drop 0.2
 set g_balance_shotgun_switchdelay_raise 0.2
 set g_balance_shotgun_weaponreplace ""
@@ -90,7 +92,7 @@ set g_balance_machinegun_sustained_refire 0.1
 set g_balance_machinegun_sustained_spread 0.03
 set g_balance_machinegun_switchdelay_drop 0.2
 set g_balance_machinegun_switchdelay_raise 0.2
-set g_balance_machinegun_weaponreplace "arc machinegun"
+set g_balance_machinegun_weaponreplace ""
 set g_balance_machinegun_weaponstart 0
 set g_balance_machinegun_weaponstartoverride -1
 set g_balance_machinegun_weaponthrowable 1
@@ -100,7 +102,7 @@ set g_balance_mortar_bouncefactor 0.5
 set g_balance_mortar_bouncestop 0.075
 set g_balance_mortar_primary_ammo 2
 set g_balance_mortar_primary_animtime 0.3
-set g_balance_mortar_primary_damage 50
+set g_balance_mortar_primary_damage 55
 set g_balance_mortar_primary_damageforcescale 0
 set g_balance_mortar_primary_edgedamage 25
 set g_balance_mortar_primary_force 250
@@ -174,12 +176,12 @@ set g_balance_minelayer_weaponstartoverride -1
 set g_balance_minelayer_weaponthrowable 1
 // }}}
 // {{{ #6: Electro
-set g_balance_electro_combo_comboradius 250
+set g_balance_electro_combo_comboradius 300
 set g_balance_electro_combo_comboradius_thruwall 200
 set g_balance_electro_combo_damage 50
 set g_balance_electro_combo_edgedamage 25
 set g_balance_electro_combo_force 120
-set g_balance_electro_combo_radius 100
+set g_balance_electro_combo_radius 150
 set g_balance_electro_combo_safeammocheck 1
 set g_balance_electro_combo_speed 2000
 set g_balance_electro_primary_ammo 4
@@ -191,7 +193,7 @@ set g_balance_electro_primary_force 200
 set g_balance_electro_primary_lifetime 5
 set g_balance_electro_primary_midaircombo_explode 1
 set g_balance_electro_primary_midaircombo_interval 0.1
-set g_balance_electro_primary_midaircombo_radius 100
+set g_balance_electro_primary_midaircombo_radius 150
 set g_balance_electro_primary_radius 100
 set g_balance_electro_primary_refire 0.6
 set g_balance_electro_primary_speed 2500
@@ -203,10 +205,10 @@ set g_balance_electro_secondary_animtime 0.2
 set g_balance_electro_secondary_bouncefactor 0.3
 set g_balance_electro_secondary_bouncestop 0.05
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_damage 40
+set g_balance_electro_secondary_damage 30
 set g_balance_electro_secondary_damagedbycontents 1
 set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_edgedamage 20
+set g_balance_electro_secondary_edgedamage 15
 set g_balance_electro_secondary_force 50
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 4
@@ -232,7 +234,7 @@ set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_damage 12
 set g_balance_crylink_primary_edgedamage 6
-set g_balance_crylink_primary_force -60
+set g_balance_crylink_primary_force -50
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
@@ -292,7 +294,7 @@ set g_balance_vortex_charge_limit 1
 set g_balance_vortex_charge_maxspeed 800
 set g_balance_vortex_charge_mindmg 40
 set g_balance_vortex_charge_minspeed 400
-set g_balance_vortex_charge_rate 0.4
+set g_balance_vortex_charge_rate 0.6
 set g_balance_vortex_charge_rot_pause 0
 set g_balance_vortex_charge_rot_rate 0
 set g_balance_vortex_charge_shot_multiplier 0
@@ -345,9 +347,9 @@ set g_balance_hagar_reload_ammo 0
 set g_balance_hagar_reload_time 2
 set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_ammo 1
-set g_balance_hagar_secondary_damage 40
+set g_balance_hagar_secondary_damage 35
 set g_balance_hagar_secondary_damageforcescale 0
-set g_balance_hagar_secondary_edgedamage 20
+set g_balance_hagar_secondary_edgedamage 17.5
 set g_balance_hagar_secondary_force 75
 set g_balance_hagar_secondary_health 15
 set g_balance_hagar_secondary_lifetime_min 10
@@ -376,7 +378,7 @@ set g_balance_hagar_weaponthrowable 1
 // {{{ #10: Devastator
 set g_balance_devastator_ammo 4
 set g_balance_devastator_animtime 0.4
-set g_balance_devastator_damage 70
+set g_balance_devastator_damage 80
 set g_balance_devastator_damageforcescale 1
 set g_balance_devastator_detonatedelay 0.02
 set g_balance_devastator_edgedamage 40
@@ -394,7 +396,7 @@ set g_balance_devastator_reload_ammo 0
 set g_balance_devastator_reload_time 2
 set g_balance_devastator_remote_damage 70
 set g_balance_devastator_remote_edgedamage 35
-set g_balance_devastator_remote_force 400
+set g_balance_devastator_remote_force 300
 set g_balance_devastator_remote_jump_damage 70
 set g_balance_devastator_remote_jump_radius 0
 set g_balance_devastator_remote_jump_velocity_z_add 400
@@ -717,7 +719,7 @@ set g_balance_shockwave_melee_traces 10
 set g_balance_shockwave_switchdelay_drop 0.2
 set g_balance_shockwave_switchdelay_raise 0.2
 set g_balance_shockwave_weaponreplace ""
-set g_balance_shockwave_weaponstart 1
+set g_balance_shockwave_weaponstart 0
 set g_balance_shockwave_weaponstartoverride -1
 set g_balance_shockwave_weaponthrowable 0
 // }}}
@@ -741,7 +743,7 @@ set g_balance_arc_cooldown 2.5
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1
-set g_balance_arc_burst_heat 5
+set g_balance_arc_burst_heat 4
 set g_balance_arc_beam_maxangle 10
 set g_balance_arc_beam_nonplayerdamage 80
 set g_balance_arc_beam_range 1000