Merge branch 'master' into Mario/electro_combo_over_time

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

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 5cfa34882b2710471c8e0a44157dda9feff17eb5..8bfabc37381affe93c9fc40f67355c3993baf1c6 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -179,8 +179,11 @@ set g_balance_minelayer_weaponthrowable 1
 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_damage_interval 0.05
+set g_balance_electro_combo_duration 1.5
+set g_balance_electro_combo_edgedamage 45
+set g_balance_electro_combo_force -100
+set g_balance_electro_combo_power 3
 set g_balance_electro_combo_radius 150
 set g_balance_electro_combo_safeammocheck 1
 set g_balance_electro_combo_speed 2000
@@ -557,6 +560,7 @@ set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
+set g_balance_rifle_primary_headshot_multiplier 0
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
 set g_balance_rifle_primary_solidpenetration 62.2
@@ -571,6 +575,7 @@ set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
 set g_balance_rifle_secondary_force 50
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4