Merge branch 'Juhu/strafehud-centerline' into 'master'

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

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 218a807bb8b0241ba9367d5c92d11db9d9129717..5cb22ec3c50aa4fa74073a31a31d3b2c529a407d 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -107,7 +107,7 @@ set g_balance_mortar_primary_damageforcescale 0
 set g_balance_mortar_primary_edgedamage 25
 set g_balance_mortar_primary_force 250
 set g_balance_mortar_primary_health 15
-set g_balance_mortar_primary_lifetime 5
+set g_balance_mortar_primary_lifetime 20
 set g_balance_mortar_primary_lifetime_stick 0
 set g_balance_mortar_primary_radius 120
 set g_balance_mortar_primary_refire 0.8
@@ -126,7 +126,7 @@ set g_balance_mortar_secondary_damageforcescale 4
 set g_balance_mortar_secondary_edgedamage 30
 set g_balance_mortar_secondary_force 250
 set g_balance_mortar_secondary_health 30
-set g_balance_mortar_secondary_lifetime 5
+set g_balance_mortar_secondary_lifetime 20
 set g_balance_mortar_secondary_lifetime_bounce 0.5
 set g_balance_mortar_secondary_lifetime_stick 0
 set g_balance_mortar_secondary_radius 120
@@ -216,14 +216,16 @@ 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
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1.6
+set g_balance_electro_secondary_refire 1.2
+set g_balance_electro_secondary_refire2 0.2
 set g_balance_electro_secondary_speed 1000
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0
 set g_balance_electro_secondary_stick 0
+set g_balance_electro_secondary_stick_lifetime -1
 set g_balance_electro_secondary_touchexplode 1
 set g_balance_electro_switchdelay_drop 0.2
 set g_balance_electro_switchdelay_raise 0.2
@@ -314,7 +316,7 @@ set g_balance_vortex_primary_damagefalloff_forcehalflife 0
 set g_balance_vortex_primary_damagefalloff_halflife 0
 set g_balance_vortex_primary_damagefalloff_maxdist 0
 set g_balance_vortex_primary_damagefalloff_mindist 0
-set g_balance_vortex_primary_force 400
+set g_balance_vortex_primary_force 200
 set g_balance_vortex_primary_refire 1.5
 set g_balance_vortex_reload_ammo 0
 set g_balance_vortex_reload_time 2
@@ -764,7 +766,7 @@ set g_balance_arc_beam_tightness 0.6
 set g_balance_arc_bolt 1
 set g_balance_arc_bolt_ammo 1
 set g_balance_arc_bolt_bounce_count 0
-set g_balance_arc_bolt_bounce_damage 0
+set g_balance_arc_bolt_bounce_explode 0
 set g_balance_arc_bolt_bounce_lifetime 0
 set g_balance_arc_bolt_count 1
 set g_balance_arc_bolt_damage 25