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=eefae7fa6c9992a2e2c2bd067e64346eeedc1e36;hb=e6eb6e7fc36a3a243c5171b8cc3db88e823514d4;hpb=fbe3374887df56456328739a11a08732320d2e8c

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index eefae7fa6..320ce2280 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -4,9 +4,9 @@ set g_balance_blaster_primary_damage 25
 set g_balance_blaster_primary_delay 0
 set g_balance_blaster_primary_edgedamage 12.5
 set g_balance_blaster_primary_force 300
-set g_balance_blaster_primary_force_zscale 1.2
+set g_balance_blaster_primary_force_zscale 1.25
 set g_balance_blaster_primary_lifetime 5
-set g_balance_blaster_primary_radius 70
+set g_balance_blaster_primary_radius 60
 set g_balance_blaster_primary_refire 0.7
 set g_balance_blaster_primary_shotangle 0
 set g_balance_blaster_primary_speed 6000
@@ -24,8 +24,8 @@ set g_balance_blaster_secondary_refire 0.7
 set g_balance_blaster_secondary_shotangle 0
 set g_balance_blaster_secondary_speed 6000
 set g_balance_blaster_secondary_spread 0
-set g_balance_blaster_switchdelay_drop 0.15
-set g_balance_blaster_switchdelay_raise 0.15
+set g_balance_blaster_switchdelay_drop 0.2
+set g_balance_blaster_switchdelay_raise 0.2
 set g_balance_blaster_weaponreplace ""
 set g_balance_blaster_weaponstart 1
 set g_balance_blaster_weaponstartoverride -1
@@ -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
@@ -119,7 +121,7 @@ set g_balance_mortar_reload_ammo 0
 set g_balance_mortar_reload_time 2
 set g_balance_mortar_secondary_ammo 2
 set g_balance_mortar_secondary_animtime 0.3
-set g_balance_mortar_secondary_damage 60
+set g_balance_mortar_secondary_damage 55
 set g_balance_mortar_secondary_damageforcescale 4
 set g_balance_mortar_secondary_edgedamage 30
 set g_balance_mortar_secondary_force 250
@@ -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
@@ -292,14 +294,14 @@ 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
 set g_balance_vortex_charge_start 0.5
 set g_balance_vortex_charge_velocity_rate 0
 set g_balance_vortex_primary_ammo 6
-set g_balance_vortex_primary_animtime 0.6
+set g_balance_vortex_primary_animtime 0.4
 set g_balance_vortex_primary_damage 80
 set g_balance_vortex_primary_damagefalloff_forcehalflife 0
 set g_balance_vortex_primary_damagefalloff_halflife 0
@@ -322,8 +324,8 @@ set g_balance_vortex_secondary_damagefalloff_maxdist 0
 set g_balance_vortex_secondary_damagefalloff_mindist 0
 set g_balance_vortex_secondary_force 0
 set g_balance_vortex_secondary_refire 0
-set g_balance_vortex_switchdelay_drop 0.2
-set g_balance_vortex_switchdelay_raise 0.2
+set g_balance_vortex_switchdelay_drop 0.25
+set g_balance_vortex_switchdelay_raise 0.25
 set g_balance_vortex_weaponreplace ""
 set g_balance_vortex_weaponstart 0
 set g_balance_vortex_weaponstartoverride -1
@@ -339,21 +341,21 @@ set g_balance_hagar_primary_health 15
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_radius 65
 set g_balance_hagar_primary_refire 0.16667
-set g_balance_hagar_primary_speed 2500
+set g_balance_hagar_primary_speed 2200
 set g_balance_hagar_primary_spread 0.03
 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
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_load 1
-set g_balance_hagar_secondary_load_abort 0
+set g_balance_hagar_secondary_load_abort 1
 set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_load_hold 4
 set g_balance_hagar_secondary_load_linkexplode 0
@@ -364,7 +366,7 @@ set g_balance_hagar_secondary_load_spread 0.075
 set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_radius 80
 set g_balance_hagar_secondary_refire 0.5
-set g_balance_hagar_secondary_speed 2500
+set g_balance_hagar_secondary_speed 2000
 set g_balance_hagar_secondary_spread 0.05
 set g_balance_hagar_switchdelay_drop 0.2
 set g_balance_hagar_switchdelay_raise 0.2
@@ -376,25 +378,25 @@ 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 35
-set g_balance_devastator_force 450
+set g_balance_devastator_edgedamage 40
+set g_balance_devastator_force 400
 set g_balance_devastator_guidedelay 0.2
 set g_balance_devastator_guidegoal 512
-set g_balance_devastator_guiderate 70
+set g_balance_devastator_guiderate 90
 set g_balance_devastator_guideratedelay 0.01
 set g_balance_devastator_guidestop 0
 set g_balance_devastator_health 30
 set g_balance_devastator_lifetime 10
 set g_balance_devastator_radius 110
-set g_balance_devastator_refire 1.2
+set g_balance_devastator_refire 1.1
 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
@@ -521,11 +523,14 @@ set g_balance_tuba_animtime 0.05
 set g_balance_tuba_attenuation 0.5
 set g_balance_tuba_damage 5
 set g_balance_tuba_edgedamage 0
+set g_balance_tuba_fadetime 0.25
 set g_balance_tuba_force 40
+set g_balance_tuba_pitchstep 6
 set g_balance_tuba_radius 200
 set g_balance_tuba_refire 0.05
 set g_balance_tuba_switchdelay_drop 0.2
 set g_balance_tuba_switchdelay_raise 0.2
+set g_balance_tuba_volume 1
 set g_balance_tuba_weaponreplace ""
 set g_balance_tuba_weaponstart 0
 set g_balance_tuba_weaponstartoverride -1
@@ -567,7 +572,7 @@ set g_balance_rifle_weaponstartoverride -1
 set g_balance_rifle_weaponthrowable 1
 // }}}
 // {{{ #17: Fireball
-set g_balance_fireball_primary_animtime 0.2
+set g_balance_fireball_primary_animtime 0.4
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0
 set g_balance_fireball_primary_bfgradius 1000
@@ -714,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
 // }}}
@@ -723,17 +728,22 @@ set g_balance_arc_beam_ammo 4
 set g_balance_arc_beam_animtime 0.2
 set g_balance_arc_beam_botaimlifetime 0
 set g_balance_arc_beam_botaimspeed 0
-set g_balance_arc_beam_damage 90
+set g_balance_arc_beam_damage 115
 set g_balance_arc_beam_degreespersegment 1
 set g_balance_arc_beam_distancepersegment 0
 set g_balance_arc_beam_falloff_halflifedist 0
 set g_balance_arc_beam_falloff_maxdist 0
 set g_balance_arc_beam_falloff_mindist 0
 set g_balance_arc_beam_force 900
-set g_balance_arc_beam_healing_amax 200
+set g_balance_arc_beam_healing_amax 100
 set g_balance_arc_beam_healing_aps 50
-set g_balance_arc_beam_healing_hmax 200
+set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
+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 4
 set g_balance_arc_beam_maxangle 10
 set g_balance_arc_beam_nonplayerdamage 80
 set g_balance_arc_beam_range 1000
@@ -741,7 +751,7 @@ set g_balance_arc_beam_refire 0.5
 set g_balance_arc_beam_returnspeed 8
 set g_balance_arc_beam_tightness 0.5
 set g_balance_arc_burst_ammo 15
-set g_balance_arc_burst_damage 500
+set g_balance_arc_burst_damage 250
 set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_switchdelay_drop 0.3