Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 0e9f45baf8c1d2cfef74feea04db4b2268a6b726..7d15db819938a8afbaa8974748a3f4861f5393d0 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -905,55 +905,55 @@ set g_balance_okmachinegun_weaponstart 0
 set g_balance_okmachinegun_weaponstartoverride -1
 set g_balance_okmachinegun_weaponthrowable 1
 // }}}
-// {{{ Overkill Vortex
-set g_balance_okvortex_charge 0
-set g_balance_okvortex_charge_animlimit 0.5
-set g_balance_okvortex_charge_limit 1
-set g_balance_okvortex_charge_maxspeed 800
-set g_balance_okvortex_charge_mindmg 40
-set g_balance_okvortex_charge_minspeed 400
-set g_balance_okvortex_charge_rate 0.6
-set g_balance_okvortex_charge_rot_pause 0
-set g_balance_okvortex_charge_rot_rate 0
-set g_balance_okvortex_charge_shot_multiplier 0
-set g_balance_okvortex_charge_start 0.5
-set g_balance_okvortex_charge_velocity_rate 0
-set g_balance_okvortex_primary_ammo 10
-set g_balance_okvortex_primary_animtime 0.65
-set g_balance_okvortex_primary_damage 100
-set g_balance_okvortex_primary_damagefalloff_forcehalflife 0
-set g_balance_okvortex_primary_damagefalloff_halflife 0
-set g_balance_okvortex_primary_damagefalloff_maxdist 0
-set g_balance_okvortex_primary_damagefalloff_mindist 0
-set g_balance_okvortex_primary_force 500
-set g_balance_okvortex_primary_refire 1
-set g_balance_okvortex_reload_ammo 50
-set g_balance_okvortex_reload_time 2
-set g_balance_okvortex_secondary 2
-set g_balance_okvortex_secondary_ammo 0
-set g_balance_okvortex_secondary_animtime 0.2
-set g_balance_okvortex_secondary_chargepool 0
-set g_balance_okvortex_secondary_chargepool_pause_regen 1
-set g_balance_okvortex_secondary_chargepool_regen 0.15
-set g_balance_okvortex_secondary_damage 25
-set g_balance_okvortex_secondary_damagefalloff_forcehalflife 0
-set g_balance_okvortex_secondary_damagefalloff_halflife 0
-set g_balance_okvortex_secondary_damagefalloff_maxdist 0
-set g_balance_okvortex_secondary_damagefalloff_mindist 0
-set g_balance_okvortex_secondary_force 300
-set g_balance_okvortex_secondary_refire 0.7
-set g_balance_okvortex_secondary_refire_type 1
-set g_balance_okvortex_secondary_delay 0
-set g_balance_okvortex_secondary_edgedamage 12.5
-set g_balance_okvortex_secondary_lifetime 5
-set g_balance_okvortex_secondary_radius 70
-set g_balance_okvortex_secondary_shotangle 0
-set g_balance_okvortex_secondary_speed 6000
-set g_balance_okvortex_secondary_spread 0
-set g_balance_okvortex_switchdelay_drop 0.2
-set g_balance_okvortex_switchdelay_raise 0.2
-set g_balance_okvortex_weaponreplace ""
-set g_balance_okvortex_weaponstart 0
-set g_balance_okvortex_weaponstartoverride -1
-set g_balance_okvortex_weaponthrowable 1
+// {{{ Overkill Nex
+set g_balance_oknex_charge 0
+set g_balance_oknex_charge_animlimit 0.5
+set g_balance_oknex_charge_limit 1
+set g_balance_oknex_charge_maxspeed 800
+set g_balance_oknex_charge_mindmg 40
+set g_balance_oknex_charge_minspeed 400
+set g_balance_oknex_charge_rate 0.6
+set g_balance_oknex_charge_rot_pause 0
+set g_balance_oknex_charge_rot_rate 0
+set g_balance_oknex_charge_shot_multiplier 0
+set g_balance_oknex_charge_start 0.5
+set g_balance_oknex_charge_velocity_rate 0
+set g_balance_oknex_primary_ammo 10
+set g_balance_oknex_primary_animtime 0.65
+set g_balance_oknex_primary_damage 100
+set g_balance_oknex_primary_damagefalloff_forcehalflife 0
+set g_balance_oknex_primary_damagefalloff_halflife 0
+set g_balance_oknex_primary_damagefalloff_maxdist 0
+set g_balance_oknex_primary_damagefalloff_mindist 0
+set g_balance_oknex_primary_force 500
+set g_balance_oknex_primary_refire 1
+set g_balance_oknex_reload_ammo 50
+set g_balance_oknex_reload_time 2
+set g_balance_oknex_secondary 2
+set g_balance_oknex_secondary_ammo 0
+set g_balance_oknex_secondary_animtime 0.2
+set g_balance_oknex_secondary_chargepool 0
+set g_balance_oknex_secondary_chargepool_pause_regen 1
+set g_balance_oknex_secondary_chargepool_regen 0.15
+set g_balance_oknex_secondary_damage 25
+set g_balance_oknex_secondary_damagefalloff_forcehalflife 0
+set g_balance_oknex_secondary_damagefalloff_halflife 0
+set g_balance_oknex_secondary_damagefalloff_maxdist 0
+set g_balance_oknex_secondary_damagefalloff_mindist 0
+set g_balance_oknex_secondary_force 300
+set g_balance_oknex_secondary_refire 0.7
+set g_balance_oknex_secondary_refire_type 1
+set g_balance_oknex_secondary_delay 0
+set g_balance_oknex_secondary_edgedamage 12.5
+set g_balance_oknex_secondary_lifetime 5
+set g_balance_oknex_secondary_radius 70
+set g_balance_oknex_secondary_shotangle 0
+set g_balance_oknex_secondary_speed 6000
+set g_balance_oknex_secondary_spread 0
+set g_balance_oknex_switchdelay_drop 0.2
+set g_balance_oknex_switchdelay_raise 0.2
+set g_balance_oknex_weaponreplace ""
+set g_balance_oknex_weaponstart 0
+set g_balance_oknex_weaponstartoverride -1
+set g_balance_oknex_weaponthrowable 1
 // }}}