X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fdefs.qh;h=b53f2c47a22ec384006585d342b3bb0b97f58015;hb=cf4f57c4dedbc5059d219d6199ba924594c6468a;hp=0e2bce89e13dbd266ac6051464b45d54b9fbf254;hpb=aaa0540204466e528bf0b5d1d4410823d807cc27;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 0e2bce89..b53f2c47 100644
--- 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
 #define BUTTON_ZOOM        button4
 #define BUTTON_CROUCH      button5
-#define BUTTON_GRABBER        button6
+#define BUTTON_JETPACK     button6
 #define BUTTON_INFO        button7
 #define BUTTON_CHAT        buttonchat
 #define BUTTON_USE         buttonuse
@@ -65,11 +65,15 @@ float maxclients;
 
 // Vore functions
 
-.entity eater;
+.entity predator;
+.entity fakepredator;
+.float swallow_progress_prey, swallow_progress_pred;
 .float digesting;
-.float stomach_load;
+.float stomach_load, stomach_maxload;
 .float weapon_delay;
-.float stat_eaten, stat_stomachload, stat_digesting;
+.float fakeprey;
+.float stat_eaten, stat_stomachload, stat_stomachmaxload, stat_digesting, stat_canleave, stat_canswallow;
+.float dropweapon_check;
 
 // Fields
 
@@ -158,6 +162,15 @@ float maxclients;
 .vector anim_forwardleft; // player running forward and left
 .vector anim_backright; // player running backward and right
 .vector anim_backleft; // player running back and left
+.vector anim_melee; // player doing the melee action
+.vector anim_duck; // player doing the melee action
+.vector anim_duckwalkbackwards;
+.vector anim_duckwalkstrafeleft;
+.vector anim_duckwalkstraferight;
+.vector anim_duckwalkforwardright;
+.vector anim_duckwalkforwardleft;
+.vector anim_duckwalkbackright;
+.vector anim_duckwalkbackleft;
 
 // weapon animation vectors:
 .vector anim_fire1;
@@ -196,13 +209,13 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 .float		killcount;
 .float hitsound, typehitsound;
 
-.float watersound_finished;
-.float digestsound_finished;
+.float watersound_finished, digestsound_finished, gurglesound_finished;
 .float iscreature;
 .vector oldvelocity;
 
-.float pauseregen_finished;
+.float pauseregenhealth_finished;
 .float pauserothealth_finished;
+.float pauseregenarmor_finished;
 .float pauserotarmor_finished;
 .float pauserotfuel_finished;
 .string item_pickupsound;
@@ -211,6 +224,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 
 .entity weaponentity;
 .entity exteriorweaponentity;
+.vector weaponentity_glowmod;
 .float switchweapon;
 .float autoswitch;
 float weapon_action(float wpn, float wrequest);
@@ -242,6 +256,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)
 float WR_KILLMESSAGE    = 8; // sets w_deathtypestring or leaves it alone
 float WR_RESETPLAYER    = 9; // does not need to do anything
+float WR_RELOAD         = 10; // used for reloading
 
 void weapon_defaultspawnfunc(float wpn);
 
@@ -304,8 +319,6 @@ string getTimeoutText(float addOneSecond);
 
 .entity flagcarried;
 
-.entity lastrocket;
-
 .float playerid;
 float playerid_last;
 .float noalign;		// if set to 1, the item or spawnpoint won't be dropped to the floor
@@ -320,6 +333,7 @@ float default_weapon_alpha;
 
 .float() customizeentityforclient;
 .float cvar_cl_handicap;
+.float cvar_cl_clippedspectating;
 .float cvar_scr_centertime;
 .float cvar_cl_shownames;
 .string cvar_g_voretournamentversion;
@@ -333,7 +347,8 @@ float sv_clforceplayermodels;
 .float cvar_cl_gunalign;
 .float cvar_cl_noantilag;
 .float cvar_cl_vore_stomachmodel;
-.float cvar_cl_vore_cameraspeed;
+.float cvar_cl_vore_gulletmodel;
+.float cvar_cl_vore_autodigest;
 .float cvar_chase_active;
 
 void Announce(string snd);
@@ -441,8 +456,10 @@ float next_pingtime;
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
 		_VOICEMSG(death) \
+		_VOICEMSG(fall) \
 		_VOICEMSG(drown) \
 		_VOICEMSG(gasp) \
+		_VOICEMSG(grab) \
 		_VOICEMSG(swallow) \
 		_VOICEMSG(digest) \
 		_VOICEMSG(regurgitate) \
@@ -459,6 +476,8 @@ float next_pingtime;
 		_VOICEMSG(meet) \
 		_VOICEMSG(seenflag) \
 		_VOICEMSG(taunt) \
+		_VOICEMSG(pred) \
+		_VOICEMSG(prey) \
 		_VOICEMSG(teamshoot)
 
 #define _VOICEMSG(m) .string playersound_##m;
@@ -498,12 +517,16 @@ string globalsound_metalstep;
 #define VOICETYPE_TAUNT 15
 #define VOICETYPE_GURGLE 16
 
+#define TAUNTTYPE_DEATH 1
+#define TAUNTTYPE_VOREPRED 2
+#define TAUNTTYPE_VOREPREY 3
+
 void PrecachePlayerSounds(string f);
 void PrecacheGlobalSound(string samplestring);
 void UpdatePlayerSounds();
 void ClearPlayerSounds();
 void PlayerSound(entity player, .string samplefield, float channel, float voicetype);
-void GlobalSound(string samplestring, float channel, float voicetype);
+void GlobalSound(string samplestring, float channel, float voicetype, float vol);
 void VoiceMessage(string type, string message);
 
 // autotaunt system
@@ -586,6 +609,8 @@ string matchid;
 .float hitplotfh;
 .string noise4;
 
+.float last_pickup;
+
 .float stat_hit;
 .float stat_fired;
 .float stat_count;
@@ -593,18 +618,27 @@ string matchid;
 .float stats_hit[WEP_MAXCOUNT];  // for hitscan bullets hit
 .float stats_fired[WEP_MAXCOUNT];  // for hitscan bullets fired
 
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);
+.float stat_sbring1_type, stat_sbring1_clip, stat_sbring2_type, stat_sbring2_clip;
+.float stat_crosshair_style;
 
 .float stat_leadlimit;
 
-float radar_showennemies;
+.float stat_respawn_time; // shows respawn time, and is negative when awaiting respawn
 
 #ifdef PROFILING
 float client_cefc_accumulator;
 float client_cefc_accumulatortime;
 #endif
 
+..float current_ammo;
+
+.float weapon_load[WEP_MAXCOUNT];
+.float clip_load;
+.float old_clip_load;
+.float clip_size;
+
+.float grabber_stunned;
+
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX
 
@@ -622,3 +656,31 @@ string deathmessage;
 
 .float cvar_cl_accuracy_data_share;
 .float cvar_cl_accuracy_data_receive;
+
+// dodging
+.float cvar_cl_dodging_timeout;
+
+// these are used to store the last key press time for each of the keys..
+.float last_FORWARD_KEY_time;
+.float last_BACKWARD_KEY_time;
+.float last_LEFT_KEY_time;
+.float last_RIGHT_KEY_time;
+
+// these store the movement direction at the time of the dodge action happening.
+.float dodging_direction_x;
+.float dodging_direction_y;
+
+// this indicates the last time a dodge was executed. used to check if another one is allowed
+// and to ramp up the dodge acceleration in the physics hook.
+.float last_dodging_time;
+
+// set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
+.float dodging_action;
+
+// This is the velocity gain to be added over the ramp time.
+// It will decrease from frame to frame during dodging_action = 1
+// until it's 0.
+.float dodging_velocity_gain;
+
+// the jump part of the dodge cannot be ramped
+.float dodging_single_action;