Merge branch 'master' into Mario/weapons

[xonotic/xonotic-data.pk3dir.git] / bal-wep-xonotic.cfg

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 02c71b0ba6905ff1708b3a5cad794dfe1c7f6c69..db8d41dd22f87e651406fa8b5eb6b03df8732a0d 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -264,6 +264,7 @@ set g_balance_arc_beam_range 1000
 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 0
 set g_balance_arc_burst_damage 500
 set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
@@ -444,6 +445,11 @@ 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_jump_damage 40
+set g_balance_devastator_remote_jump_radius 200
+set g_balance_devastator_remote_jump_velocity_z_add 500
+set g_balance_devastator_remote_jump_velocity_z_max 1500
+set g_balance_devastator_remote_jump_velocity_z_min 500
 set g_balance_devastator_remote_radius 110
 set g_balance_devastator_speed 1300
 set g_balance_devastator_speedaccel 1300
@@ -503,7 +509,7 @@ set g_balance_hook_primary_animtime 0.3
 set g_balance_hook_primary_hooked_ammo 5
 set g_balance_hook_primary_hooked_time_free 2
 set g_balance_hook_primary_hooked_time_max 0
-set g_balance_hook_primary_refire 0
+set g_balance_hook_primary_refire 0.2
 set g_balance_hook_secondary_animtime 0.3
 set g_balance_hook_secondary_damage 25
 set g_balance_hook_secondary_damageforcescale 0