Merge branch 'master' into mirceakitsune/quantity_stomach_load

[voretournament/voretournament.git] / data / qcsrc / common / constants.qh

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index 2f0d2ecec95170e06bf958d0f6c255c888e54291..ea23f8619dcdc7570a2877d4865ba6d3d090bc50 100644 (file)
--- a/data/qcsrc/common/constants.qh
+++ b/data/qcsrc/common/constants.qh
@@ -277,17 +277,25 @@ const float STAT_NB_METERSTART = 45;
 const float STAT_SHOTORG = 46; // compressShotOrigin\r
 const float STAT_LEADLIMIT = 47;\r
 const float STAT_WINNING = 48;\r
-const float STAT_VORE_LOAD = 49;\r
-const float STAT_VORE_DIGESTING = 50;\r
-const float STAT_VORE_EATEN = 51;\r
-const float STAT_VORE_CANLEAVE = 52;\r
+const float STAT_WEAPON_CLIPLOAD = 49;\r
+const float STAT_WEAPON_CLIPSIZE = 50;\r
+const float STAT_LAST_PICKUP = 51;\r
+const float STAT_VORE_LOAD = 52;\r
+const float STAT_VORE_MAXLOAD = 53;\r
+const float STAT_VORE_DIGESTING = 54;\r
+const float STAT_VORE_EATEN = 55;\r
+const float STAT_VORE_CANLEAVE = 56;\r
+const float STAT_VORE_CANSWALLOW = 57;\r
+const float STAT_SBRING1_TYPE = 58;\r
+const float STAT_SBRING1_CLIP = 59;\r
+const float STAT_SBRING2_TYPE = 60;\r
+const float STAT_SBRING2_CLIP = 61;\r
+const float STAT_HUD = 62;\r
+const float HUD_NORMAL = 0;\r
 const float CTF_STATE_ATTACK = 1;\r
 const float CTF_STATE_DEFEND = 2;\r
 const float CTF_STATE_COMMANDER = 3;\r
 \r
-const float STAT_HUD = 52;\r
-const float HUD_NORMAL = 0;\r
-\r
 // moved that here so the client knows the max.\r
 // # of maps, I'll use arrays for them :P\r
 #define MAPVOTE_COUNT 10\r
@@ -389,8 +397,8 @@ float       ATTN_IDLE                               = 2;
 float  ATTN_STATIC                             = 3;\r
 float  ATTN_MAX                                = 3.984375;\r
 \r
-#define VOL_BASE 0.7\r
-#define VOL_BASEVOICE 1.0\r
+#define VOL_BASE 0.3\r
+#define VOL_BASEVOICE 0.5\r
 \r
 // this sets sounds and other properties of the projectiles in csqc\r
 float PROJECTILE_EXAMPLE = 1; // VoreTournament doesn't use any projectiles by default, so this example will guide us if any will be added in the future\r
@@ -427,7 +435,8 @@ float DEATH_FIRE = 10017;
 float DEATH_TURRET = 10020;\r
 float DEATH_QUIET = 10021;\r
 float DEATH_DIGESTION = 10022;\r
-float DEATH_STOMACHKICK = 10023;\r
+float DEATH_REGURGITATION = 10023;\r
+float DEATH_STOMACHKICK = 10024;\r
 \r
 float DEATH_SBMINIGUN = 10030;\r
 float DEATH_SBROCKET  = 10031;\r