From: Samual Lenks <samual@xonotic.org>
Date: Mon, 23 Jul 2012 16:53:48 +0000 (-0400)
Subject: I forgot some gauntlet/melee stuff-- fixed.
X-Git-Tag: xonotic-v0.8.0~152^2~408^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d247aee7df21d03621c5c8387f734bd112b70d25;p=xonotic%2Fxonotic-data.pk3dir.git

I forgot some gauntlet/melee stuff-- fixed.
---

diff --git a/balance25.cfg b/balance25.cfg
index 151372fed..27ced6b82 100644
--- 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 32f61143a..90e9ed79d 100644
--- 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 22e1ae546..c93a16f73 100644
--- 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 d4a181726..afd6462d6 100644
--- 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