Merge branch 'master' into fruitiex/fruitbalance

[xonotic/xonotic-data.pk3dir.git] / balanceXPM.cfg

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index ddf6446b11a05306c1f4280784aa11bee844f636..9033e42630db57ecaac3b230a291c3a81d2dd223 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -242,6 +242,11 @@ set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_speed 12000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 0
+set g_balance_shotgun_secondary_melee 0 // ew, bad! Still uses the melee anim!
+set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
+set g_balance_shotgun_secondary_melee_range 60
+set g_balance_shotgun_secondary_melee_swing 50
+set g_balance_shotgun_secondary_melee_time 0.4
 set g_balance_shotgun_secondary_bullets 6 // one more per shot than 15/3 (primary bullets/amount of shots = 3)
 set g_balance_shotgun_secondary_damage 7
 set g_balance_shotgun_secondary_force 20
@@ -303,20 +308,19 @@ set g_balance_grenadelauncher_secondary_bouncestop 0.075
 // }}}
 // {{{ electro // TODO
 set g_balance_electro_lightning 1
-set g_balance_electro_primary_damage 2
+set g_balance_electro_primary_damage 120
 set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 13
-set g_balance_electro_primary_force_up 100
+set g_balance_electro_primary_force 780
+set g_balance_electro_primary_force_up 6000
 set g_balance_electro_primary_radius 850
 set g_balance_electro_primary_comboradius 0
 set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
 set g_balance_electro_primary_refire 0
-set g_balance_electro_primary_animtime 0
-set g_balance_electro_primary_ammo 0.66
+set g_balance_electro_primary_animtime 0.05
+set g_balance_electro_primary_ammo 40
 set g_balance_electro_primary_range 800
-set g_balance_electro_primary_velocityfactor 0.75
 set g_balance_electro_secondary_damage 50
 set g_balance_electro_secondary_spread 0.05
 set g_balance_electro_secondary_edgedamage 0
@@ -528,6 +532,7 @@ set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0
 set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot
+set g_balance_campingrifle_secondary 1
 set g_balance_campingrifle_secondary_damage 35
 set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head
 set g_balance_campingrifle_secondary_spread 0.008