X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fcommon%2Fconstants.qh;h=56a50b94937b8ae2d7e98c7334cf7d6d95d87d17;hb=cc045f9d09b57e3ce32ee45f807b18438e410380;hp=74307aef40f1d868228afed4a5992e77d67f1111;hpb=929ad35e68958e61d3ff3a21d523ea2086aa32db;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index 74307aef..56a50b94 100644
--- a/data/qcsrc/common/constants.qh
+++ b/data/qcsrc/common/constants.qh
@@ -48,15 +48,14 @@ const float TE_CSQC_PICTURE = 100;
 const float TE_CSQC_RACE = 101;
 const float TE_CSQC_SPAWN = 102;
 const float TE_CSQC_ZCURVEPARTICLES = 103;
-const float TE_CSQC_NEXGUNBEAMPARTICLE = 104;
-const float TE_CSQC_LIGHTNINGARC = 105;
-const float TE_CSQC_TEAMNAGGER = 106;
-const float TE_CSQC_PINGPLREPORT = 107;
-const float TE_CSQC_OTHERPLREPORT = 108;
-const float TE_CSQC_VOTE = 109;
-const float TE_CSQC_VOTERESET = 110;
-const float TE_CSQC_ANNOUNCE = 111;
-const float TE_CSQC_TARGET_MUSIC = 112;
+const float TE_CSQC_LIGHTNINGARC = 104;
+const float TE_CSQC_TEAMNAGGER = 105;
+const float TE_CSQC_PINGPLREPORT = 106;
+const float TE_CSQC_OTHERPLREPORT = 107;
+const float TE_CSQC_VOTE = 108;
+const float TE_CSQC_VOTERESET = 109;
+const float TE_CSQC_ANNOUNCE = 110;
+const float TE_CSQC_TARGET_MUSIC = 111;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -99,6 +98,7 @@ const float ENT_CLIENT_MODELEFFECT = 22;
 const float ENT_CLIENT_WARPZONE = 23;
 const float ENT_CLIENT_WARPZONE_CAMERA = 24;
 const float ENT_CLIENT_TRIGGER_MUSIC = 25;
+const float ENT_CLIENT_PORTRAIT = 26;
 
 const float ENT_CLIENT_TURRET = 40;
 
@@ -277,17 +277,30 @@ const float STAT_FUEL = 44;
 const float STAT_NB_METERSTART = 45;
 const float STAT_SHOTORG = 46; // compressShotOrigin
 const float STAT_LEADLIMIT = 47;
-const float STAT_BULLETS_LOADED = 48;
-const float STAT_STOMACH_LOAD = 49;
-const float STAT_STOMACH_DIGESTING = 50;
-const float STAT_STOMACH_EATEN = 51;
+const float STAT_WINNING = 48;
+const float STAT_WEAPON_CLIPLOAD = 49;
+const float STAT_WEAPON_CLIPSIZE = 50;
+const float STAT_LAST_PICKUP = 51;
+const float STAT_VORE_LOAD = 52;
+const float STAT_VORE_MAXLOAD = 53;
+const float STAT_VORE_DIGESTING = 54;
+const float STAT_VORE_EATEN = 55;
+const float STAT_VORE_CANLEAVE = 56;
+const float STAT_VORE_CANSWALLOW = 57;
+const float STAT_VORE_PROGRESS_PREY = 58;
+const float STAT_VORE_PROGRESS_PRED = 59;
+const float STAT_CROSSHAIR_STYLE = 60;
+const float STAT_SBRING1_TYPE = 61;
+const float STAT_SBRING1_CLIP = 62;
+const float STAT_SBRING2_TYPE = 63;
+const float STAT_SBRING2_CLIP = 64;
+const float STAT_RESPAWN_TIME = 65;
+const float STAT_HUD = 66;
+const float HUD_NORMAL = 0;
 const float CTF_STATE_ATTACK = 1;
 const float CTF_STATE_DEFEND = 2;
 const float CTF_STATE_COMMANDER = 3;
 
-const float STAT_HUD = 52;
-const float HUD_NORMAL = 0;
-
 // moved that here so the client knows the max.
 // # of maps, I'll use arrays for them :P
 #define MAPVOTE_COUNT 10
@@ -389,8 +402,8 @@ float	ATTN_IDLE				= 2;
 float	ATTN_STATIC				= 3;
 float	ATTN_MAX   				= 3.984375;
 
-#define VOL_BASE 0.7
-#define VOL_BASEVOICE 1.0
+#define VOL_BASE 0.3
+#define VOL_BASEVOICE 0.5
 
 // this sets sounds and other properties of the projectiles in csqc
 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
@@ -427,7 +440,8 @@ float DEATH_FIRE = 10017;
 float DEATH_TURRET = 10020;
 float DEATH_QUIET = 10021;
 float DEATH_DIGESTION = 10022;
-float DEATH_STOMACHKICK = 10023;
+float DEATH_REGURGITATION = 10023;
+float DEATH_STOMACHKICK = 10024;
 
 float DEATH_SBMINIGUN = 10030;
 float DEATH_SBROCKET  = 10031;
@@ -472,3 +486,5 @@ float WATERLEVEL_SWIMMING = 2;
 float WATERLEVEL_SUBMERGED = 3;
 
 float MAX_SHOT_DISTANCE = 32768;
+
+float PARTICLE_MULTIPLIER = 10;