Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'

diff --combined defaultXonotic.cfg
index 247acb007224f5fac87e201fd8243c026d88931c,593bd77bf8321c6073f628f35b1ae9d5053bd4dc..d7e3f2a957d77604a4ca304ebc69521307957b57
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -178,16 -178,19 +178,19 @@@ seta crosshair_fireball ""      "crosshair t
  seta crosshair_fireball_color "0.2 1.0 0.2"   "crosshair color to display when wielding the fireball"
  seta crosshair_fireball_alpha 1       "crosshair alpha value to display when wielding the fireball"
  seta crosshair_fireball_size 1        "crosshair size when wielding the fireball"
+ 
+ // ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge)
  seta crosshair_ring_size 2    "bullet counter ring size for Rifle, velocity ring for Nex"
- seta crosshair_campingrifle_bulletcounter_alpha 0.15
- 
- seta crosshair_nexvelocity_alpha 0.15
- seta crosshair_nexvelocity_currentcharge_scale 30
- seta crosshair_nexvelocity_currentcharge_alpha 0.15
- seta crosshair_nexvelocity_currentcharge_color_red 0.8
- seta crosshair_nexvelocity_currentcharge_color_green 0
- seta crosshair_nexvelocity_currentcharge_color_blue 0
- seta crosshair_nexvelocity_currentcharge_movingavg_rate 0.05
+ 
+ seta crosshair_ring_campingrifle_alpha 0.15
+ 
+ seta crosshair_ring_nex_outer_alpha 0.15
+ seta crosshair_ring_nex_inner_alpha 0.15
+ seta crosshair_ring_nex_inner_color_red 0.8
+ seta crosshair_ring_nex_inner_color_green 0
+ seta crosshair_ring_nex_inner_color_blue 0
+ seta crosshair_ring_nex_currentcharge_scale 30
+ seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05
  
  seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
  seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
@@@ -353,7 -356,7 +356,7 @@@ seta sv_precacheitems 
  set sv_spectator_speed_multiplier 1.5
  seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no spectating)"
  seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables"
 -seta sv_defaultplayermodel "models/player/nexus.zym" "default model selection, only works if sv_defaultcharacter is set to 1"
 +seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1"
  seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1"
  seta sv_defaultplayermodel_red ""     "\"\" means see sv_defaultplayermodel"
  seta sv_defaultplayerskin_red 0
@@@ -484,7 -487,8 +487,7 @@@ set g_minstagib_extralives 2       "how many 
  set g_minstagib_ammo_start 10 "starting ammo"
  set g_minstagib_ammo_drop 5   "how much ammo you'll get for weapons or cells"
  set g_minstagib_invis_alpha 0.15
 -set g_minstagib_speed_jumpheight 1.8 "jump height multiplier that applies while you carry the invincibility powerup"
 -set g_minstagib_speed_moverate 1.25 "speed-multiplier that applies while you carry the invincibility powerup"
 +set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
  set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
  set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
  set g_weaponarena_random "0"  "if set to a number, only that weapon count is given on every spawn (randomly)"
@@@ -710,9 -714,12 +713,9 @@@ set g_balance_rune_regen_combo_limitmo
  set g_balance_rune_speed_atkrate                              0.66
  set g_balance_curse_slow_atkrate                              1.5
  set g_balance_rune_speed_combo_atkrate                        1.2
 -set g_balance_rune_speed_moverate                     1.25
 -set g_balance_curse_slow_moverate                     0.8
 -set g_balance_rune_speed_combo_moverate                       0.9
 -set g_balance_rune_speed_jumpheight                   1.4
 -set g_balance_curse_slow_jumpheight                   1.0
 -set g_balance_rune_speed_combo_jumpheight             1.0
 +set g_balance_rune_speed_highspeed                    1.5
 +set g_balance_curse_slow_highspeed                    0.6
 +set g_balance_rune_speed_combo_highspeed                      0.9
  
  // domination
  set g_domination                      0 "Domination: capture and hold control points to gain points"
@@@ -752,10 -759,10 +755,10 @@@ set g_ca_warmup 10 "how long the player
  
  // onslaught
  set g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
 -set g_onslaught_gen_health 5000
 +set g_onslaught_gen_health 2500
  set g_onslaught_cp_health 1000
  set g_onslaught_cp_buildhealth 100
 -set g_onslaught_cp_buildtime 10
 +set g_onslaught_cp_buildtime 5
  set g_onslaught_cp_regen 20
  
  // assault
@@@ -808,7 -815,7 +811,7 @@@ set g_nexball_basketball_delay_hol
  set g_nexball_basketball_delay_hold_forteam   60    "time before a ball reset when a team holds the ball for too long"
  set g_nexball_basketball_teamsteal             1    "1 to allow players to steal from teammates, 0 to disallow"
  
 -set g_nexball_basketball_carrier_speed         0.9  "speed multiplier for the ballcarrier"
 +set g_nexball_basketball_carrier_highspeed         0.8  "speed multiplier for the ballcarrier"
  
  set g_nexball_meter_period                  1    "time to make a full cycle on the power meter"
  set g_nexball_basketball_meter              1    "use the power meter for basketball"
@@@ -1118,13 -1125,13 +1121,13 @@@ alias singleplayer_continue "set scmenu
  alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu"
  
  // Green's fullbright skins
 -alias cl_fbskin_green "playermodel models/player/nexus.zym; playerskin 6; color 3 3"
 -alias cl_fbskin_red "playermodel models/player/nexus.zym; playerskin 6; color 4 4"
 -alias cl_fbskin_orange "playermodel models/player/nexus.zym; playerskin 6; color 14 14"
 -alias cl_fbskin_off "playermodel models/player/nexus.zym; playerskin 0"
 -alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 51"
 -alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 68"
 -alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/nexus.zym; sv_defaultplayerskin 6; sv_defaultplayercolors 238"
 +alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color 3 3"
 +alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
 +alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
 +alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
 +alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
 +alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
 +alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
  alias sv_fbskin_off "g_fullbrightplayers 0; sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
  
  seta sv_servermodelsonly 1

diff --combined qcsrc/common/constants.qh
index bd7047f5b725fc3f791afb2bd293b49f2cb4b58c,b1ccf1e31b4a18304a38555b238014de857e9204..87484cd8f31c7902cf52e2ed1f69e458b9b7193d
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -310,13 -310,13 +310,14 @@@ const float STAT_SHOTORG = 46; // compr
  const float STAT_LEADLIMIT = 47;
  const float STAT_BULLETS_LOADED = 48;
  const float STAT_NEX_CHARGE = 49;
- const float   STAT_LAST_PICKUP = 50;
+ const float STAT_LAST_PICKUP = 50;
  const float STAT_HUD = 51;
+ const float STAT_NEX_CHARGEPOOL = 52;
  
  // see DP source, quakedef.h
  const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222;
  const float STAT_MOVEVARS_AIRSTRAFEACCEL_QW = 223;
 +const float STAT_MOVEVARS_MAXSPEED = 244;
  const float STAT_MOVEVARS_AIRACCEL_QW = 254;
  
  const float CTF_STATE_ATTACK = 1;

diff --combined qcsrc/server/cl_client.qc
index 991017f0fe5cbdb8054e76085f5befae3842c2fd,8ef5faa9d304400b5f901397ce508b95d4c7e753..3d06f58718b22da56d8bb07432bc266df9b81a43
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -599,7 -599,6 +599,7 @@@ void PutObserverInServer (void
        }
  
        DropAllRunes(self);
 +      MUTATOR_CALLHOOK(MakePlayerObserver);
  
        Portal_ClearAll(self);
  
@@@ -714,6 -713,8 +714,6 @@@
        }
        else
                self.frags = FRAGS_SPECTATOR;
 -
 -      MUTATOR_CALLHOOK(MakePlayerObserver);
  }
  
  float RestrictSkin(float s)
@@@ -889,7 -890,11 +889,11 @@@ void PutClientInServer (void
                self.air_finished = time + 12;
                self.dmg = 2;
                if(cvar("g_balance_nex_charge"))
+               {
+                       if(cvar("g_balance_nex_secondary_charge_pool"))
+                               self.nex_charge_pool_ammo = 1;
                        self.nex_charge = cvar("g_balance_nex_charge_start");
+               }
  
                if(inWarmupStage)
                {

diff --combined qcsrc/server/defs.qh
index b4458499b784f117e99a7de5eb6877ff66b529c9,bec782f009327b9af0cbb663eac5ea1861b21b51..b99f27544a81488fc4cbbaae2a742b16eb718cad
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -531,7 -531,6 +531,7 @@@ float game_starttime; //point in time w
  .float stat_sv_airaccel_qw;
  .float stat_sv_airstrafeaccel_qw;
  .float stat_sv_airspeedlimit_nonqw;
 +.float stat_sv_maxspeed;
  
  void W_Porto_Remove (entity p);
  
@@@ -656,6 -655,7 +656,7 @@@ string deathmessage
  
  .float nex_charge;
  .float nex_charge_rottime;
+ .float nex_charge_pool_ammo;
  
  float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
  

diff --combined qcsrc/server/g_world.qc
index c6fe74b47384c693c7e014b11a3b133bc7ace787,9e9907e13a35acd7d6b5798256c4aed9e39659a0..b2029ae70aabc8cbdfd4c5ad9b014cd493f51672
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -808,6 -808,7 +808,7 @@@ void spawnfunc_worldspawn (void
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
  
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
+       addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_charge_pool_ammo);
  
        if(g_ca)
        {
@@@ -816,7 -817,6 +817,7 @@@
        }
        // g_movementspeed hack
        addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw);
 +      addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed);
        addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw);
        addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw);