Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

diff --combined bal-wep-overkill.cfg
index 430cbf56f700261488063620763b749c13f2d6dc,8c6432264c1fcdc8cf57488d3dc5a44fe786ab67..a7b30e4d24b3c5f077834b4a70341445704c5cce
--- 1/bal-wep-overkill.cfg
--- 2/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@@ -1,8 -1,8 +1,8 @@@
  // {{{ #1: Blaster
  set g_balance_blaster_primary_animtime 0.2
- set g_balance_blaster_primary_damage 25
+ set g_balance_blaster_primary_damage 20
  set g_balance_blaster_primary_delay 0
- set g_balance_blaster_primary_edgedamage 12.5
+ set g_balance_blaster_primary_edgedamage 10
  set g_balance_blaster_primary_force 300
  set g_balance_blaster_primary_force_zscale 1.25
  set g_balance_blaster_primary_lifetime 5
@@@ -43,8 -43,6 +43,6 @@@ set g_balance_shotgun_primary_spread 0.
  set g_balance_shotgun_reload_ammo 50
  set g_balance_shotgun_reload_time 2
  set g_balance_shotgun_secondary 1
- set g_balance_shotgun_secondary_alt_animtime 0.2
- set g_balance_shotgun_secondary_alt_refire 1.2
  set g_balance_shotgun_secondary_animtime 1.15
  set g_balance_shotgun_secondary_damage 70
  set g_balance_shotgun_secondary_force 200
@@@ -58,6 -56,8 +56,8 @@@ set g_balance_shotgun_secondary_melee_s
  set g_balance_shotgun_secondary_melee_time 0.15
  set g_balance_shotgun_secondary_melee_traces 10
  set g_balance_shotgun_secondary_refire 1.25
+ set g_balance_shotgun_secondary_alt_animtime 0.2
+ set g_balance_shotgun_secondary_alt_refire 1.2
  set g_balance_shotgun_switchdelay_drop 0.2
  set g_balance_shotgun_switchdelay_raise 0.2
  set g_balance_shotgun_weaponreplace ""
@@@ -193,7 -193,7 +193,7 @@@ set g_balance_electro_primary_force 20
  set g_balance_electro_primary_lifetime 5
  set g_balance_electro_primary_midaircombo_explode 1
  set g_balance_electro_primary_midaircombo_interval 0.1
- set g_balance_electro_primary_midaircombo_radius 150
+ set g_balance_electro_primary_midaircombo_radius 0
  set g_balance_electro_primary_radius 100
  set g_balance_electro_primary_refire 0.6
  set g_balance_electro_primary_speed 2500
@@@ -218,9 -218,9 +218,9 @@@ set g_balance_electro_secondary_refire
  set g_balance_electro_secondary_speed 1000
  set g_balance_electro_secondary_speed_up 200
  set g_balance_electro_secondary_speed_z 0
- set g_balance_electro_secondary_spread 0.04
+ set g_balance_electro_secondary_spread 0
  set g_balance_electro_secondary_stick 0
- set g_balance_electro_secondary_touchexplode 0
+ set g_balance_electro_secondary_touchexplode 1
  set g_balance_electro_switchdelay_drop 0.2
  set g_balance_electro_switchdelay_raise 0.2
  set g_balance_electro_weaponreplace ""
@@@ -233,8 -233,8 +233,8 @@@ set g_balance_crylink_primary_ammo 
  set g_balance_crylink_primary_animtime 0.3
  set g_balance_crylink_primary_bouncedamagefactor 0.5
  set g_balance_crylink_primary_bounces 1
- set g_balance_crylink_primary_damage 12
- set g_balance_crylink_primary_edgedamage 6
+ set g_balance_crylink_primary_damage 10
+ set g_balance_crylink_primary_edgedamage 5
  set g_balance_crylink_primary_force -50
  set g_balance_crylink_primary_joindelay 0.1
  set g_balance_crylink_primary_joinexplode 1
@@@ -243,7 -243,7 +243,7 @@@ set g_balance_crylink_primary_joinexplo
  set g_balance_crylink_primary_joinexplode_force 0
  set g_balance_crylink_primary_joinexplode_radius 0
  set g_balance_crylink_primary_joinspread 0.2
- set g_balance_crylink_primary_linkexplode 1
+ set g_balance_crylink_primary_linkexplode 0
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_middle_lifetime 5
  set g_balance_crylink_primary_other_fadetime 5
@@@ -260,9 -260,9 +260,9 @@@ set g_balance_crylink_secondary_ammo 
  set g_balance_crylink_secondary_animtime 0.2
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
  set g_balance_crylink_secondary_bounces 0
- set g_balance_crylink_secondary_damage 10
- set g_balance_crylink_secondary_edgedamage 5
- set g_balance_crylink_secondary_force -250
+ set g_balance_crylink_secondary_damage 8
+ set g_balance_crylink_secondary_edgedamage 4
+ set g_balance_crylink_secondary_force -200
  set g_balance_crylink_secondary_joindelay 0
  set g_balance_crylink_secondary_joinexplode 0
  set g_balance_crylink_secondary_joinexplode_damage 0
@@@ -343,7 -343,7 +343,7 @@@ set g_balance_hagar_primary_lifetime 
  set g_balance_hagar_primary_radius 65
  set g_balance_hagar_primary_refire 0.16667
  set g_balance_hagar_primary_speed 2200
- set g_balance_hagar_primary_spread 0.03
+ set g_balance_hagar_primary_spread 0
  set g_balance_hagar_reload_ammo 0
  set g_balance_hagar_reload_time 2
  set g_balance_hagar_secondary 1
@@@ -368,7 -368,7 +368,7 @@@ set g_balance_hagar_secondary_load_spre
  set g_balance_hagar_secondary_radius 80
  set g_balance_hagar_secondary_refire 0.5
  set g_balance_hagar_secondary_speed 2000
- set g_balance_hagar_secondary_spread 0.05
+ set g_balance_hagar_secondary_spread 0
  set g_balance_hagar_switchdelay_drop 0.2
  set g_balance_hagar_switchdelay_raise 0.2
  set g_balance_hagar_weaponreplace ""
@@@ -399,9 -399,9 +399,9 @@@ set g_balance_devastator_remote_damage 
  set g_balance_devastator_remote_edgedamage 35
  set g_balance_devastator_remote_force 300
  set g_balance_devastator_remote_jump_damage 70
- set g_balance_devastator_remote_jump_force 0
+ set g_balance_devastator_remote_jump_force 450
  set g_balance_devastator_remote_jump_radius 0
- set g_balance_devastator_remote_jump_velocity_z_add 400
+ set g_balance_devastator_remote_jump_velocity_z_add 0
  set g_balance_devastator_remote_jump_velocity_z_max 1500
  set g_balance_devastator_remote_jump_velocity_z_min 400
  set g_balance_devastator_remote_radius 110
@@@ -435,6 -435,7 +435,7 @@@ set g_balance_porto_weaponthrowable 
  // {{{ #12: Vaporizer
  set g_balance_vaporizer_primary_ammo 10
  set g_balance_vaporizer_primary_animtime 0.3
+ set g_balance_vaporizer_primary_damage 150
  set g_balance_vaporizer_primary_refire 1
  set g_balance_vaporizer_reload_ammo 0
  set g_balance_vaporizer_reload_time 0
@@@ -455,7 -456,7 +456,7 @@@ set g_balance_vaporizer_switchdelay_rai
  set g_balance_vaporizer_weaponreplace ""
  set g_balance_vaporizer_weaponstart 0
  set g_balance_vaporizer_weaponstartoverride -1
- set g_balance_vaporizer_weaponthrowable 0
+ set g_balance_vaporizer_weaponthrowable 1
  // }}}
  // {{{ #13: Grappling Hook
  set g_balance_hook_primary_ammo 5
@@@ -676,23 -677,23 +677,23 @@@ set g_balance_seeker_weaponthrowable 
  // }}}
  // {{{ #19: Shockwave (MUTATOR WEAPON)
  set g_balance_shockwave_blast_animtime 0.3
- set g_balance_shockwave_blast_damage 20
+ set g_balance_shockwave_blast_damage 40
  set g_balance_shockwave_blast_distance 1000
  set g_balance_shockwave_blast_edgedamage 0
- set g_balance_shockwave_blast_force 200
+ set g_balance_shockwave_blast_force 15
  set g_balance_shockwave_blast_force_forwardbias 50
- set g_balance_shockwave_blast_force_zscale 2
+ set g_balance_shockwave_blast_force_zscale 1
  set g_balance_shockwave_blast_jump_damage 20
  set g_balance_shockwave_blast_jump_edgedamage 0
- set g_balance_shockwave_blast_jump_force 300
- set g_balance_shockwave_blast_jump_force_velocitybias 0
- set g_balance_shockwave_blast_jump_force_zscale 1.25
+ set g_balance_shockwave_blast_jump_force 100
+ set g_balance_shockwave_blast_jump_force_velocitybias 1
+ set g_balance_shockwave_blast_jump_force_zscale 1
  set g_balance_shockwave_blast_jump_multiplier_accuracy 0.5
  set g_balance_shockwave_blast_jump_multiplier_distance 0.5
  set g_balance_shockwave_blast_jump_multiplier_min 0
  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_accuracy 0.45
+ set g_balance_shockwave_blast_multiplier_distance 0.2
  set g_balance_shockwave_blast_multiplier_min 0
  set g_balance_shockwave_blast_refire 0.75
  set g_balance_shockwave_blast_splash_damage 15
@@@ -726,26 -727,31 +727,31 @@@ set g_balance_shockwave_weaponstartover
  set g_balance_shockwave_weaponthrowable 0
  // }}}
  // {{{ #20: Arc
- set g_balance_arc_beam_ammo 4
- set g_balance_arc_beam_animtime 0.2
+ set g_balance_arc_beam_ammo 6
+ set g_balance_arc_beam_animtime 0.1
  set g_balance_arc_beam_botaimlifetime 0
  set g_balance_arc_beam_botaimspeed 0
- set g_balance_arc_beam_damage 115
+ set g_balance_arc_beam_damage 100
  set g_balance_arc_beam_degreespersegment 1
  set g_balance_arc_beam_distancepersegment 0
  set g_balance_arc_beam_falloff_halflifedist 0
  set g_balance_arc_beam_falloff_maxdist 0
  set g_balance_arc_beam_falloff_mindist 0
- set g_balance_arc_beam_force 900
- set g_balance_arc_beam_healing_amax 100
+ set g_balance_arc_beam_force 600
+ set g_balance_arc_beam_healing_amax 0
  set g_balance_arc_beam_healing_aps 50
  set g_balance_arc_beam_healing_hmax 150
  set g_balance_arc_beam_healing_hps 50
- set g_balance_arc_beam_heat 1
+ set g_balance_arc_cooldown 2.5
+ set g_balance_arc_cooldown_release 0
+ set g_balance_arc_overheat_max 5
+ set g_balance_arc_overheat_min 3
+ set g_balance_arc_beam_heat 0
+ set g_balance_arc_burst_heat 5
  set g_balance_arc_beam_maxangle 10
  set g_balance_arc_beam_nonplayerdamage 80
  set g_balance_arc_beam_range 1000
- set g_balance_arc_beam_refire 0.5
+ set g_balance_arc_beam_refire 0.25
  set g_balance_arc_beam_returnspeed 8
  set g_balance_arc_beam_tightness 0.5
  set g_balance_arc_bolt 0
@@@ -753,24 -759,19 +759,19 @@@ set g_balance_arc_bolt_ammo 
  set g_balance_arc_bolt_damage 25
  set g_balance_arc_bolt_damageforcescale 0
  set g_balance_arc_bolt_edgedamage 12.5
- set g_balance_arc_bolt_force 100
+ set g_balance_arc_bolt_force 120
  set g_balance_arc_bolt_health 15
  set g_balance_arc_bolt_lifetime 5
  set g_balance_arc_bolt_radius 65
  set g_balance_arc_bolt_refire 0.16667
- set g_balance_arc_bolt_speed 2200
- set g_balance_arc_bolt_spread 0.03
+ set g_balance_arc_bolt_speed 2300
+ set g_balance_arc_bolt_spread 0
  set g_balance_arc_burst_ammo 15
  set g_balance_arc_burst_damage 250
  set g_balance_arc_burst_healing_aps 100
  set g_balance_arc_burst_healing_hps 100
- set g_balance_arc_burst_heat 4
- set g_balance_arc_cooldown 2.5
- set g_balance_arc_cooldown_release 1
- set g_balance_arc_overheat_max 5
- set g_balance_arc_overheat_min 3
- set g_balance_arc_switchdelay_drop 0.3
- set g_balance_arc_switchdelay_raise 0.3
+ set g_balance_arc_switchdelay_drop 0.2
+ set g_balance_arc_switchdelay_raise 0.2
  set g_balance_arc_weaponreplace ""
  set g_balance_arc_weaponstart 0
  set g_balance_arc_weaponstartoverride -1
@@@ -808,7 -809,7 +809,7 @@@ set g_balance_rpc_radius 30
  set g_balance_rpc_refire 1
  set g_balance_rpc_reload_ammo 10
  set g_balance_rpc_reload_time 1
- set g_balance_rpc_speed 1250
+ set g_balance_rpc_speed 2500
  set g_balance_rpc_speedaccel 5000
  set g_balance_rpc_switchdelay_drop 0.2
  set g_balance_rpc_switchdelay_raise 0.2
@@@ -817,129 -818,3 +818,129 @@@ set g_balance_rpc_weaponstart 
  set g_balance_rpc_weaponstartoverride 0
  set g_balance_rpc_weaponthrowable 0
  // }}}
 +// {{{ Overkill Shotgun
 +set g_balance_okshotgun_primary_ammo 6.25
 +set g_balance_okshotgun_primary_animtime 0.65
 +set g_balance_okshotgun_primary_bot_range 512
 +set g_balance_okshotgun_primary_bullets 10
 +set g_balance_okshotgun_primary_damage 17
 +set g_balance_okshotgun_primary_force 80
 +set g_balance_okshotgun_primary_refire 0.75
 +set g_balance_okshotgun_primary_solidpenetration 3.8
 +set g_balance_okshotgun_primary_spread 0.07
 +set g_balance_okshotgun_reload_ammo 50
 +set g_balance_okshotgun_reload_time 2
 +set g_balance_okshotgun_secondary_ammo 0
 +set g_balance_okshotgun_secondary_animtime 0.2
 +set g_balance_okshotgun_secondary_damage 25
 +set g_balance_okshotgun_secondary_delay 0
 +set g_balance_okshotgun_secondary_edgedamage 12.5
 +set g_balance_okshotgun_secondary_force 300
 +set g_balance_okshotgun_secondary_lifetime 5
 +set g_balance_okshotgun_secondary_radius 70
 +set g_balance_okshotgun_secondary_refire 0.7
 +set g_balance_okshotgun_secondary_shotangle 0
 +set g_balance_okshotgun_secondary_speed 6000
 +set g_balance_okshotgun_secondary_spread 0
 +set g_balance_okshotgun_switchdelay_drop 0.2
 +set g_balance_okshotgun_switchdelay_raise 0.2
 +set g_balance_okshotgun_weaponreplace ""
 +set g_balance_okshotgun_weaponstart 0
 +set g_balance_okshotgun_weaponstartoverride -1
 +set g_balance_okshotgun_weaponthrowable 1
 +// }}}
 +// {{{ Overkill Machine Gun
 +set g_balance_okmachinegun_burst 3
 +set g_balance_okmachinegun_burst_ammo 3
 +set g_balance_okmachinegun_burst_animtime 0.3
 +set g_balance_okmachinegun_burst_refire 0.06
 +set g_balance_okmachinegun_burst_refire2 0.45
 +set g_balance_okmachinegun_burst_speed 0
 +set g_balance_okmachinegun_first 1
 +set g_balance_okmachinegun_first_ammo 1
 +set g_balance_okmachinegun_first_damage 14
 +set g_balance_okmachinegun_first_force 5
 +set g_balance_okmachinegun_first_refire 0.125
 +set g_balance_okmachinegun_first_spread 0.03
 +set g_balance_okmachinegun_mode 1
 +set g_balance_okmachinegun_reload_ammo 30
 +set g_balance_okmachinegun_reload_time 1.5
 +set g_balance_okmachinegun_secondary_ammo 0
 +set g_balance_okmachinegun_secondary_animtime 0.2
 +set g_balance_okmachinegun_secondary_damage 25
 +set g_balance_okmachinegun_secondary_delay 0
 +set g_balance_okmachinegun_secondary_edgedamage 12.5
 +set g_balance_okmachinegun_secondary_force 300
 +set g_balance_okmachinegun_secondary_lifetime 5
 +set g_balance_okmachinegun_secondary_radius 70
 +set g_balance_okmachinegun_secondary_refire 0.7
 +set g_balance_okmachinegun_secondary_shotangle 0
 +set g_balance_okmachinegun_secondary_speed 6000
 +set g_balance_okmachinegun_secondary_spread 0
 +set g_balance_okmachinegun_solidpenetration 13.1
 +set g_balance_okmachinegun_spread_add 0.012
 +set g_balance_okmachinegun_spread_max 0.05
 +set g_balance_okmachinegun_spread_min 0
 +set g_balance_okmachinegun_sustained_ammo 1
 +set g_balance_okmachinegun_sustained_damage 25
 +set g_balance_okmachinegun_sustained_force 5
 +set g_balance_okmachinegun_sustained_refire 0.1
 +set g_balance_okmachinegun_sustained_spread 0.01
 +set g_balance_okmachinegun_switchdelay_drop 0.2
 +set g_balance_okmachinegun_switchdelay_raise 0.2
 +set g_balance_okmachinegun_weaponreplace ""
 +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_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
 +// }}}

diff --combined qcsrc/client/view.qc
index 24c844398b9021802dc59f38987edd00d1d1f9a5,65df30fd89ff5ec10f4eb3804cac9e7d3776c384..7b01b5c67b014fab6c2f98e50bd957a01612c85b
--- 1/qcsrc/client/view.qc
--- 2/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@@ -26,7 -26,6 +26,7 @@@
  
  #include <common/vehicles/all.qh>
  #include <common/weapons/_all.qh>
 +#include <common/mutators/mutator/overkill/okvortex.qh>
  #include <common/viewloc.qh>
  #include <common/minigames/cl_minigames.qh>
  #include <common/minigames/cl_minigames_hud.qh>
@@@ -467,7 -466,7 +467,7 @@@ vector GetCurrentFov(float fov
                {
                        entity wepent = viewmodels[slot];
                        if(wepent.switchweapon == wepent.activeweapon)
 -                      if((wepent.activeweapon == WEP_VORTEX && !WEP_CVAR(vortex, secondary)) || (wepent.activeweapon == WEP_RIFLE && !WEP_CVAR(rifle, secondary))) // do NOT use switchweapon here
 +                      if((wepent.activeweapon == WEP_VORTEX && !WEP_CVAR(vortex, secondary)) || (wepent.activeweapon == WEP_RIFLE && !WEP_CVAR(rifle, secondary)) || (wepent.activeweapon == WEP_OVERKILL_VORTEX && !WEP_CVAR(okvortex, secondary))) // do NOT use switchweapon here
                                zoomdir += button_attack2;
                }
        }
@@@ -659,7 -658,6 +659,7 @@@ float TrueAimCheck(entity wepent
                case WEP_MORTAR: // toss curve
                        return SHOTTYPE_HITWORLD;
                case WEP_VORTEX:
 +              case WEP_OVERKILL_VORTEX:
                case WEP_VAPORIZER:
                        mv = MOVE_NORMAL;
                        break;
@@@ -877,6 -875,14 +877,14 @@@ void HitSound(
                sound(NULL, CH_INFO, SND_TYPEHIT, VOL_BASE, ATTN_NONE);
                typehit_time_prev = typehit_time;
        }
+ 
+       static float kill_time_prev = 0;
+       float kill_time = STAT(KILL_TIME);
+       if (COMPARE_INCREASING(kill_time, kill_time_prev) > autocvar_cl_hitsound_antispam_time)
+       {
+               sound(NULL, CH_INFO, SND_KILL, VOL_BASE, ATTN_NONE);
+               kill_time_prev = kill_time;
+       }
  }
  
  vector crosshair_getcolor(entity this, float health_stat)
@@@ -1182,7 -1188,7 +1190,7 @@@ void HUD_Crosshair(entity this
                                entity wepent = viewmodels[0]; // TODO: unhardcode
  
                                // handle the values
 -                              if (autocvar_crosshair_ring && wepent.activeweapon == WEP_VORTEX && vortex_charge && autocvar_crosshair_ring_vortex) // ring around crosshair representing velocity-dependent damage for the vortex
 +                              if (autocvar_crosshair_ring && (wepent.activeweapon == WEP_VORTEX || wepent.activeweapon == WEP_OVERKILL_VORTEX) && vortex_charge && autocvar_crosshair_ring_vortex) // ring around crosshair representing velocity-dependent damage for the vortex
                                {
                                        if (vortex_chargepool || use_vortex_chargepool) {
                                                use_vortex_chargepool = 1;