Add ring stats

[voretournament/voretournament.git] / data / qcsrc / server / defs.qh

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 7953f82281dc82f6e993e6082b2dc21c0980e167..14c87aed56b2ea9e2cb5d2b965d5598877b9c836 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -7,7 +7,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa
 #define BUTTON_ATCK2       button3\r
 #define BUTTON_ZOOM        button4\r
 #define BUTTON_CROUCH      button5\r
-#define BUTTON_GRABBER        button6\r
+#define BUTTON_JETPACK     button6\r
 #define BUTTON_INFO        button7\r
 #define BUTTON_CHAT        buttonchat\r
 #define BUTTON_USE         buttonuse\r
@@ -65,11 +65,14 @@ float maxclients;
 \r
 // Vore functions\r
 \r
-.entity eater;\r
+.entity predator;\r
+.entity fakepredator;\r
 .float digesting;\r
 .float stomach_load;\r
 .float weapon_delay;\r
-.float stat_eaten;\r
+.float fakeprey;\r
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave, stat_canswallow;\r
+.float dropweapon_check;\r
 \r
 // Fields\r
 \r
@@ -196,13 +199,13 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 .float         killcount;\r
 .float hitsound, typehitsound;\r
 \r
-.float watersound_finished;\r
-.float digestsound_finished;\r
+.float watersound_finished, digestsound_finished, gurglesound_finished;\r
 .float iscreature;\r
 .vector oldvelocity;\r
 \r
-.float pauseregen_finished;\r
+.float pauseregenhealth_finished;\r
 .float pauserothealth_finished;\r
+.float pauseregenarmor_finished;\r
 .float pauserotarmor_finished;\r
 .float pauserotfuel_finished;\r
 .string item_pickupsound;\r
@@ -242,6 +245,7 @@ float WR_PRECACHE       = 6; // precaches models/sounds used by this weapon
 float WR_SUICIDEMESSAGE = 7; // sets w_deathtypestring or leaves it alone (and may inspect w_deathtype for details)\r
 float WR_KILLMESSAGE    = 8; // sets w_deathtypestring or leaves it alone\r
 float WR_RESETPLAYER    = 9; // does not need to do anything\r
+float WR_RELOAD         = 10; // used for reloading\r
 \r
 void weapon_defaultspawnfunc(float wpn);\r
 \r
@@ -259,9 +263,6 @@ float alreadychangedlevel;
 .float welcomemessage_time;\r
 .float version;\r
 \r
-// minstagib vars\r
-.float jump_interval;    // laser refire\r
-\r
 //swamp\r
 .float in_swamp;              // bool\r
 .entity swampslug;            // Uses this to release from swamp ("untouch" fix)\r
@@ -307,8 +308,6 @@ string getTimeoutText(float addOneSecond);
 \r
 .entity flagcarried;\r
 \r
-.entity lastrocket;\r
-\r
 .float playerid;\r
 float playerid_last;\r
 .float noalign;                // if set to 1, the item or spawnpoint won't be dropped to the floor\r
@@ -335,6 +334,8 @@ float sv_clforceplayermodels;
 #endif\r
 .float cvar_cl_gunalign;\r
 .float cvar_cl_noantilag;\r
+.float cvar_cl_vore_stomachmodel;\r
+.float cvar_cl_vore_autodigest;\r
 .float cvar_chase_active;\r
 \r
 void Announce(string snd);\r
@@ -442,6 +443,7 @@ float next_pingtime;
 // TODO implemented fall and falling\r
 #define ALLPLAYERSOUNDS \\r
                _VOICEMSG(death) \\r
+               _VOICEMSG(fall) \\r
                _VOICEMSG(drown) \\r
                _VOICEMSG(gasp) \\r
                _VOICEMSG(swallow) \\r
@@ -460,6 +462,8 @@ float next_pingtime;
                _VOICEMSG(meet) \\r
                _VOICEMSG(seenflag) \\r
                _VOICEMSG(taunt) \\r
+               _VOICEMSG(pred) \\r
+               _VOICEMSG(prey) \\r
                _VOICEMSG(teamshoot)\r
 \r
 #define _VOICEMSG(m) .string playersound_##m;\r
@@ -499,6 +503,10 @@ string globalsound_metalstep;
 #define VOICETYPE_TAUNT 15\r
 #define VOICETYPE_GURGLE 16\r
 \r
+#define TAUNTTYPE_DEATH 1\r
+#define TAUNTTYPE_VOREPRED 2\r
+#define TAUNTTYPE_VOREPREY 3\r
+\r
 void PrecachePlayerSounds(string f);\r
 void PrecacheGlobalSound(string samplestring);\r
 void UpdatePlayerSounds();\r
@@ -540,10 +548,6 @@ float game_starttime; //point in time when the countdown is over
 vector railgun_start, railgun_end; // filled by FireRailgunBullet, used by damage code for head shot\r
 .float stat_allow_oldnexbeam;\r
 \r
-// reset to 0 on weapon switch\r
-// may be useful to all weapons\r
-.float bulletcounter;\r
-\r
 void target_voicescript_next(entity pl);\r
 void target_voicescript_clear(entity pl);\r
 \r
@@ -591,6 +595,8 @@ string matchid;
 .float hitplotfh;\r
 .string noise4;\r
 \r
+.float last_pickup;\r
+\r
 .float stat_hit;\r
 .float stat_fired;\r
 .float stat_count;\r
@@ -601,6 +607,8 @@ string matchid;
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);\r
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);\r
 \r
+.float stat_sbring1_type, stat_sbring1_clip, stat_sbring2_type, stat_sbring2_clip;\r
+\r
 .float stat_leadlimit;\r
 \r
 float radar_showennemies;\r
@@ -610,7 +618,12 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;\r
 #endif\r
 \r
-.float campingrifle_bulletcounter;\r
+..float current_ammo;\r
+\r
+.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);\r
+.float clip_load;\r
+.float old_clip_load;\r
+.float clip_size;\r
 \r
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE\r
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX\r