From: Samual Lenks <samual@xonotic.org>
Date: Wed, 11 Dec 2013 00:15:24 +0000 (-0500)
Subject: Update config
X-Git-Tag: xonotic-v0.8.0~152^2~239
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5f9b89f8e36b06b52110c945e8b9cfcdbdc070d;p=xonotic%2Fxonotic-data.pk3dir.git

Update config
---

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index db6365a75..563ce7311 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -10,8 +10,6 @@ set g_balance_blaster_primary_refire 0.7
 set g_balance_blaster_primary_shotangle 0
 set g_balance_blaster_primary_speed 6000
 set g_balance_blaster_primary_spread 0
-set g_balance_blaster_reload_ammo 0
-set g_balance_blaster_reload_time 0
 set g_balance_blaster_secondary 0
 set g_balance_blaster_secondary_animtime 0.2
 set g_balance_blaster_secondary_damage 25
@@ -31,6 +29,7 @@ set g_balance_blaster_weaponstart 1
 set g_balance_blaster_weaponstartoverride -1
 // }}}
 // {{{ #2: Shockwave
+set g_balance_shockwave_blast_animtime 0.3
 set g_balance_shockwave_blast_damage 20
 set g_balance_shockwave_blast_distance 2000
 set g_balance_shockwave_blast_edgedamage 0
@@ -49,6 +48,7 @@ set g_balance_shockwave_blast_jump_radius 150
 set g_balance_shockwave_blast_multiplier_accuracy 0.5
 set g_balance_shockwave_blast_multiplier_distance 0.5
 set g_balance_shockwave_blast_multiplier_min 0
+set g_balance_shockwave_blast_refire 0.75
 set g_balance_shockwave_blast_splash_damage 15
 set g_balance_shockwave_blast_splash_edgedamage 0
 set g_balance_shockwave_blast_splash_force 100
@@ -72,18 +72,6 @@ set g_balance_shockwave_melee_swing_side 120
 set g_balance_shockwave_melee_swing_up 30
 set g_balance_shockwave_melee_time 0.15
 set g_balance_shockwave_melee_traces 10
-set g_balance_shockwave_pellets_animtime 0.3
-set g_balance_shockwave_pellets_bulletconstant 75
-set g_balance_shockwave_pellets_bullets 14
-set g_balance_shockwave_pellets_damage 4
-set g_balance_shockwave_pellets_force 15
-set g_balance_shockwave_pellets_refire 0.75
-set g_balance_shockwave_pellets_speed 8000
-set g_balance_shockwave_pellets_spread 0.12
-set g_balance_shockwave_primary 1
-set g_balance_shockwave_reload_ammo 0
-set g_balance_shockwave_reload_time 0
-set g_balance_shockwave_secondary 1
 set g_balance_shockwave_switchdelay_drop 0.2
 set g_balance_shockwave_switchdelay_raise 0.2
 set g_balance_shockwave_weaponreplace ""