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 e70f3cd06bbc6dbbd36ecf12b197727dba6cf00b..db8d41dd22f87e651406fa8b5eb6b03df8732a0d 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -243,16 +243,31 @@ set g_balance_electro_weaponstartoverride -1
 set g_balance_electro_weaponthrowable 1
 // }}}
 // {{{ #7: Arc
-set g_balance_arc_primary_ammo 0
-set g_balance_arc_primary_animtime 0
-set g_balance_arc_primary_damage 0
-set g_balance_arc_primary_falloff_halflifedist 0
-set g_balance_arc_primary_falloff_maxdist 0
-set g_balance_arc_primary_falloff_mindist 0
-set g_balance_arc_primary_force 0
-set g_balance_arc_primary_range 0
-set g_balance_arc_primary_refire 0
-set g_balance_arc_secondary_ammo 0
+set g_balance_arc_beam_ammo 0
+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 150
+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 2000
+set g_balance_arc_beam_healing_amax 200
+set g_balance_arc_beam_healing_aps 50
+set g_balance_arc_beam_healing_hmax 200
+set g_balance_arc_beam_healing_hps 50
+set g_balance_arc_beam_maxangle 10
+set g_balance_arc_beam_nonplayerdamage 80
+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
 set g_balance_arc_switchdelay_drop 0.3
 set g_balance_arc_switchdelay_raise 0.3
 set g_balance_arc_weaponreplace ""
@@ -430,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
@@ -489,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