I forgot some gauntlet/melee stuff-- fixed.

diff --git a/balance25.cfg b/balance25.cfg
index 151372fed5a52816b6f8a644db921f33e21665a9..27ced6b82acebc204bab731e26ff8477e765a1e6 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -245,11 +245,10 @@ set g_balance_laser_primary_multiplier_accuracy 0.5
 set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0.05
-set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 1
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
-set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = gauntlet secondary
+set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
 set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
 set g_balance_laser_secondary_force 400

diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg
index 32f61143a9b5c2857b7dae1b9916a05dba8b3cee..90e9ed79de9c76a500df4535018520d1d10977f3 100644 (file)
--- a/balanceFruitieX.cfg
+++ b/balanceFruitieX.cfg
@@ -245,11 +245,10 @@ set g_balance_laser_primary_multiplier_accuracy 0.5
 set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
-set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 2 // 300 upforce
 set g_balance_laser_primary_force_velocitybias 0.3
 set g_balance_laser_primary_force_other_scale 2.5 // force 375 when pushing others around
-set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = gauntlet secondary
+set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
 set g_balance_laser_secondary_damage 200 // dps
 set g_balance_laser_secondary_edgedamage 0
 set g_balance_laser_secondary_force 1300

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 22e1ae54676862be6cbd3c13b3f0097ea590dbb8..c93a16f731846ecedea0e4b63a44807e8428ec00 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -245,11 +245,10 @@ set g_balance_laser_primary_multiplier_accuracy 0.5
 set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
-set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 1.25
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
-set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = gauntlet secondary
+set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
 set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 12.5
 set g_balance_laser_secondary_force 400

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index d4a181726504eab773de10e5394bd0d3c4d3abdb..afd6462d62f636cdd1b5e1d50c0086974157d9e0 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -245,11 +245,10 @@ set g_balance_laser_primary_multiplier_accuracy 0.6
 set g_balance_laser_primary_multiplier_distance 0.4
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
-set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 1.25
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
-set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = gauntlet secondary
+set g_balance_laser_secondary 2 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
 set g_balance_laser_secondary_damage 80
 set g_balance_laser_secondary_edgedamage 12.5
 set g_balance_laser_secondary_force 200