X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=a9a615e27987a55a36b0cd6b335a1dbe84875734;hp=780a28c153e968b6c5e8ddc1d639588f78e399e0;hb=4c85321002adc56c66fe0f47b6320ccc54e46c7a;hpb=01b01aef75b953a34373f47d6fec9783b5e5533e

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 780a28c1..a9a615e2 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -1,5 +1,5 @@
 .float regurgitate_prepare;
-.float system_delay, swallow_delay, digest_button_delay_time, regurgitate_button_delay_time;
+.float stomachkick_delay, system_delay, action_delay, digest_button_delay_time, regurgitate_button_delay_time;
 .float complain_vore;
 .float vore_oldmovetype, vore_oldsolid, vore_oldstomachload;
 
@@ -12,11 +12,16 @@ entity Swallow_player_check()
 {
 	// check if we can swallow a player instead of firing our weapon
 
-	vector w_shotorg, w_shotdir;
-	w_shotorg = self.origin + self.view_ofs;
-	w_shotdir = v_forward;
+	float swallow_range;
+	vector vore_w_shotorg, vore_w_shotdir;
 
-	WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_vore_swallow_range"), FALSE, self, ANTILAG_LATENCY(self));
+	swallow_range = cvar("g_balance_vore_swallow_range");
+	if(self.scale) // we can swallow from further or closer based on our size
+		swallow_range *= self.scale;
+	vore_w_shotorg = self.origin;
+	vore_w_shotdir = v_forward;
+
+	WarpZone_traceline_antilag(self, vore_w_shotorg, vore_w_shotorg + vore_w_shotdir * swallow_range, FALSE, self, ANTILAG_LATENCY(self));
 	if(trace_fraction < 1)
 	if(trace_ent.classname == "player")
 		return trace_ent;
@@ -28,45 +33,33 @@ float Swallow_condition_check(entity prey)
 	// checks the necessary conditions for swallowing a player
 
 	if(prey != self)
-	if(prey.classname == "player" && prey.predator.classname != "player" && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach
-	if(self.classname == "player" && self.predator.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves
-	if(!self.BUTTON_REGURGITATE && self.swallow_delay < time)
+	if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach
+	if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves
+	if(!self.BUTTON_REGURGITATE && time > self.action_delay)
 	if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))
 	{
+		string swallow_complain;
 		if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore"))
+			swallow_complain = "You cannot swallow your team mates\n";
+		else if(!cvar("g_vore_spawnshield") && prey.spawnshieldtime > time)
+			swallow_complain = "You cannot swallow someone protected by the spawn shield\n";
+		else if(self.stomach_load >= cvar("g_balance_vore_swallow_limit"))
+			swallow_complain = strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n");
+		else if(cvar("g_vore_biggergut") && prey.stomach_load > self.stomach_load)
+			swallow_complain = "You cannot swallow someone with a bigger stomach than yours\n";
+		else if(cvar("g_vore_biggersize") && prey.scale > self.scale)
+			swallow_complain = "You cannot swallow someone larger than you\n";
+
+		if(swallow_complain != "")
 		{
 			if(time > self.complain_vore && self.BUTTON_ATCK)
 			{
 				play2(self, "misc/forbidden.wav");
-				sprint(self, "You cannot swallow your team mates\n");
-				self.complain_vore = time + complain_delay_time;
-			}
-			return FALSE;
-		}
-
-		if(self.stomach_load >= cvar("g_balance_vore_swallow_limit"))
-		{
-			if(time > self.complain_vore && self.BUTTON_ATCK)
-			{
-				play2(self, "misc/forbidden.wav");
-				sprint(self, strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n"));
+				sprint(self, swallow_complain);
 				self.complain_vore = time + complain_delay_time;
 			}
 			return FALSE;
 		}
-
-		if(cvar("g_vore_biggergut"))
-		if(prey.stomach_load > self.stomach_load)
-		{
-			if(time > self.complain_vore && self.BUTTON_ATCK)
-			{
-				play2(self, "misc/forbidden.wav");
-				sprint(self, "You cannot swallow someone with a bigger stomach than yours\n");
-				self.complain_vore = time + complain_delay_time;
-			}
-			return FALSE;
-		}
-
 		return TRUE;
 	}
 	return FALSE;
@@ -90,7 +83,7 @@ float Stomach_TeamMates_check(entity pred)
 
 float Vore_CanLeave()
 {
-	if(self.predator.classname == "player")
+	if(self.stat_eaten)
 	{
 		if(!cvar("g_vore_kick")) // you are defenseless in the stomach if you can't kick, so allow leaving
 			return TRUE;
@@ -102,34 +95,68 @@ float Vore_CanLeave()
 	return FALSE;
 }
 
-// make the camera smoothly lower itself when we get swallowed
-// our aim is going from the normal view offset to half of the view offset (because half is the best positioning for the stomach model)
-.float cameraeffect_current, cameraeffect_target;
-void Vore_CameraEffect_Set(entity e)
+// position the camera properly for prey
+void Vore_SetPreyPositions()
 {
-	e.cameraeffect_current = 1;
-	e.cameraeffect_target = 2;
-}
-void Vore_CameraEffect_Apply()
-{
-	if(self.predator.classname != "player")
-		return;
+	// self is the predator and head is the prey
+
+	local entity head;
+	local vector origin_apply;
+	local float position_counter;
 
-	if(self.cvar_cl_vore_cameraspeed)
+	// In order to allow prey to see each other in the stomach, we must position each occupant differently,
+	// else all players overlap in the center. To do this, we run a loop on all players in the same stomach.
+	// For each player, the origin is updated, then a new origin is used for the next player.
+	// This requires that no more than 9 players may be in the stomach at a time!
+	FOR_EACH_PLAYER(head)
 	{
-		local float step;
-		step = self.cvar_cl_vore_cameraspeed * frametime;
-
-		// not sure if these maths are good, as the effect should be smoother
-		if(self.cameraeffect_current >= self.cameraeffect_target + step)
-			self.cameraeffect_current -= step;
-		else if(self.cameraeffect_current <= self.cameraeffect_target - step)
-			self.cameraeffect_current += step;
-	}
-	else
-		self.cameraeffect_current = self.cameraeffect_target;
+		if(head.predator == self)
+		{
+			switch(position_counter)
+			{
+				case 0:
+					origin_apply = '0 0 0'; // first occupant sits in the middle
+					break;
+				case 1:
+					origin_apply = '1 0 0'; // second occupant sits in the front
+					break;
+				case 2:
+					origin_apply = '-1 0 0'; // third occupant sits in the back
+					break;
+				case 3:
+					origin_apply = '0 1 0'; // fourth occupant sits in the right
+					break;
+				case 4:
+					origin_apply = '0 -1 0'; // fifth occupant sits in the left
+					break;
+				case 5:
+					origin_apply = '1 1 0'; // sixth occupant sits in the front-right
+					break;
+				case 6:
+					origin_apply = '-1 1 0'; // seventh occupant sits in the back-right
+					break;
+				case 7:
+					origin_apply = '1 -1 0'; // eigth occupant sits in the front-left
+					break;
+				case 8:
+					origin_apply = '-1 -1 0'; // ninth occupant sits in the back-left
+					break;
+				default:
+					break;
+			}
+
+			// since prey have their predators set as an aiment, view_ofs will specify the real origin of prey, not just the view offset
+			head.view_ofs = PL_PREY_VIEW_OFS + origin_apply * cvar("g_vore_neighborprey_distance");
+			head.view_ofs_z *= self.scale; // stomach center depends on predator scale
 
-	self.view_ofs_z = PL_VIEW_OFS_z / self.cameraeffect_current;
+			// change prey height based on scale
+			float prey_height;
+				prey_height = (head.scale - self.scale) * cvar("g_healthsize_vore_pos");
+			head.view_ofs_z += prey_height;
+
+			position_counter += 1;
+		}
+	}
 }
 
 .float gurgle_oldstomachload;
@@ -186,7 +213,6 @@ void Vore_Swallow(entity e)
 	e.velocity = '0 0 0';
 	e.movetype = MOVETYPE_FOLLOW;
 	e.solid = SOLID_NOT;
-	e.alpha = -1; // best way of hiding the eaten player
 	e.aiment = e.predator; // follow the predator, automatically unset when regurgitated
 
 	// drop keys (KH) and flags (CTF) when we get swallowed
@@ -194,8 +220,6 @@ void Vore_Swallow(entity e)
 	if(e.flagcarried)
 		DropFlag(e.flagcarried, world, e.predator);
 
-	Vore_CameraEffect_Set(e);
-
 	if(stov(cvar_string("g_vore_regurgitatecolor_release")))
 		e.colormod = stov(cvar_string("g_vore_regurgitatecolor_release"));
 
@@ -209,7 +233,7 @@ void Vore_Swallow(entity e)
 
 	PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
-	e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle;
+	e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");
 	e.predator.stomach_load += 1;
 	e.predator.regurgitate_prepare = 0;
 	e.predator.spawnshieldtime = 0; // lose spawn shield when we vore
@@ -218,8 +242,9 @@ void Vore_Swallow(entity e)
 
 	// block firing for a small amount of time, or we'll be firing the next frame after we swallow
 	e.predator.weapon_delay = time + button_delay_time;
-	e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");
+	e.predator.action_delay = time + cvar("g_balance_vore_action_delay");
 	e.system_delay = e.predator.system_delay = time + system_delay_time;
+	e.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); // don't kick immediately after being swallowed
 }
 
 void Vore_Regurgitate(entity e)
@@ -230,7 +255,6 @@ void Vore_Regurgitate(entity e)
 	if(e.health > 0) // leave SOLID_NOT for dead bodies
 		e.solid = e.vore_oldsolid;
 	e.view_ofs_z = PL_VIEW_OFS_z;
-	e.alpha = default_player_alpha;
 
 	// apply velocities
 	local vector oldforward, oldright, oldup;
@@ -250,10 +274,10 @@ void Vore_Regurgitate(entity e)
 	PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
 	pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);
-	e.predator.punchangle_x += e.predator.cvar_cl_vore_punchangle;
+	e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");
 	e.predator.stomach_load -= 1;
 	e.predator.regurgitate_prepare = 0;
-	e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");
+	e.predator.action_delay = time + cvar("g_balance_vore_action_delay");
 	Vore_WeightApply(e.predator);
 
 	// block firing for a small amount of time, or we'll be firing the next frame
@@ -266,7 +290,7 @@ void Vore_DeadPrey_Configure(entity e)
 {
 	// ran when the keepdeadprey feature is enabled and prey stays inside the stomach after dying
 
-	if(e.fakeprey || e.predator.classname != "player") // already configured
+	if(e.fakeprey || !e.stat_eaten) // we already configured everything
 		return;
 
 	// this entity is like e.predator but for dead prey, to avoid conflicts
@@ -284,9 +308,6 @@ void Vore_DeadPrey_Configure(entity e)
 	e.takedamage = DAMAGE_NO;
 	e.solid = SOLID_NOT;
 	e.aiment = e.fakepredator;
-
-	// completely remove the dead body
-	e.modelindex = 0;
 }
 
 void Vore_DeadPrey_Detach(entity e)
@@ -298,27 +319,29 @@ void Vore_DeadPrey_Detach(entity e)
 		return;
 
 	e.fakepredator = world;
-	e.fakeprey = FALSE;
+	e.fakeprey = TRUE; // keep fakeprey status
+	e.stat_eaten = 0;
 	e.aiment = world;
 	e.movetype = MOVETYPE_TOSS;
 }
 
 void Vore_PreyRelease(entity e, float pred_disconnect)
 {
-	// if the keepdeadprey feature is on, don't spit a dead prey's carcass out
-	if(e.health <= 0 && cvar("g_vore_keepdeadprey"))
+	if(pred_disconnect)
 	{
-		// if keepdeadprey is enabled and the predator disconnected, detach the dead prey
-		if(pred_disconnect)
-		{
-			if(e.fakeprey)
-				Vore_DeadPrey_Detach(e);
-		}
+		if(e.fakeprey)
+			Vore_DeadPrey_Detach(e);
 		else
+			Vore_Regurgitate(e);
+	}
+	else if(self.stat_eaten && !self.fakeprey)
+	{
+		// if the keepdeadprey feature is on, don't spit a dead prey's carcass out
+		if(e.deadflag != DEAD_NO && random() < cvar("g_vore_keepdeadprey"))
 			Vore_DeadPrey_Configure(e);
+		else
+			Vore_Regurgitate(e);
 	}
-	else
-		Vore_Regurgitate(e);
 }
 
 void Vore_Disconnect()
@@ -326,7 +349,7 @@ void Vore_Disconnect()
 	// frees prey from their predators when someone disconnects or goes spectating, or in other circumstances
 
 	// prey disconnects or goes spectating while inside someone's belly
-	if(self.predator.classname == "player")
+	if(self.stat_eaten)
 		Vore_PreyRelease(self, TRUE);
 
 	// pred disconnects or goes spectating with players in their belly
@@ -346,7 +369,7 @@ void Vore_Digest()
 {
 	// apply digestion to prey
 
-	if(time > self.predator.digestion_step)
+	if(time > self.digestion_step)
 	{
 		Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0');
 		if(cvar("g_balance_vore_digestion_vampire") && self.predator.health < cvar("g_balance_vore_digestion_vampire_stable"))
@@ -357,10 +380,10 @@ void Vore_Digest()
 			PlayerSound (self.predator, playersound_digest, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);
 			self.predator.digestsound_finished = time + 0.5;
 		}
-		self.predator.digestion_step = time + steptime;
+		self.digestion_step = time + steptime;
 	}
 
-	if(self.health <= 0)
+	if(self.deadflag != DEAD_NO)
 	if(stov(cvar_string("g_vore_regurgitatecolor_digest")))
 		self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digest"));
 }
@@ -385,7 +408,6 @@ void Vore_Teamheal()
 	}
 }
 
-.float stomachkick_delay;
 void Vore_StomachKick()
 {
 	// allows prey to kick the predator's stomach and do some damage or attempt to escape
@@ -394,12 +416,11 @@ void Vore_StomachKick()
 	{
 		float damage;
 		damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min"));
+
 		Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force"));
 		sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM);
-		self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle;
-
-		if(random() < cvar("g_balance_vore_kick_escapeprobability"))
-			Vore_Regurgitate(self);
+		self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");
+		self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");
 
 		self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");
 	}
@@ -441,7 +462,7 @@ void Vore_AutoTaunt()
 	}
 
 	// prey taunts
-	if(self.predator.classname == "player" && !(teams_matter && self.team == self.predator.team))
+	if(self.stat_eaten && !(teams_matter && self.team == self.predator.team))
 	{
 		if(!self.taunt_soundtime) // taunt_soundtime becomes 0 once the taunt has played
 		{
@@ -456,6 +477,35 @@ void Vore_AutoTaunt()
 	}
 }
 
+void Vore_SetSbarRings()
+{
+	// first clear the ring stats, then configure them if needed
+	self.stat_sbring1_type = self.stat_sbring1_clip = 0;
+	self.stat_sbring2_type = self.stat_sbring2_clip = 0;
+
+	if(self.stat_eaten)
+	{
+		if(time <= self.stomachkick_delay)
+		{
+			self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress
+			self.stat_sbring1_clip = bound(0, (time / self.stomachkick_delay - 1) / ((self.stomachkick_delay - cvar("g_balance_vore_kick_delay")) / self.stomachkick_delay - 1), 1);
+		}
+	}
+	else
+	{
+		if(time <= self.action_delay)
+		{
+			self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress
+			self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);
+		}
+		if(time <= self.regurgitate_prepare)
+		{
+			self.stat_sbring2_type = 1; // ring shows regurgitation preparing, fills with progress
+			self.stat_sbring2_clip = 1 - bound(0, (time / self.regurgitate_prepare - 1) / ((self.regurgitate_prepare - cvar("g_balance_vore_regurgitate_delay")) / self.regurgitate_prepare - 1), 1);
+		}
+	}
+}
+
 void Vore()
 {
 	// main vore code, this is where it all happens
@@ -469,7 +519,7 @@ void Vore()
 	Vore_AutoTaunt();
 
 	// wash the goo away from players once they leave the stomach
-	if(self.predator.classname != "player")
+	if(!self.stat_eaten)
 	if(stov(cvar_string("g_vore_regurgitatecolor_release")))
 	if(self.colormod)
 	if(cvar("g_vore_regurgitatecolor_release_fade"))
@@ -485,8 +535,11 @@ void Vore()
 			self.colormod_z = 1;
 	}
 
-	// set all vore related stats
-	if(self.predator.classname == "player")
+	// set all vore stats
+	Vore_SetSbarRings();
+	if(self.fakepredator.classname == "player")
+		self.stat_eaten = num_for_edict(self.fakepredator);
+	else if(self.predator.classname == "player")
 	{
 		self.stat_stomachload = self.predator.stomach_load; // necessary for the stomach board
 		self.stat_digesting = self.predator.digesting; // necessary for the stomach board
@@ -503,7 +556,7 @@ void Vore()
 	// don't allow a player inside a player inside another player :)
 	// prevent this by checking if such has happened, and taking the proper measures
 	// this code has a high priority and must not be stopped by any delay, so run it here
-	if(self.predator.predator.classname == "player")
+	if(self.predator.stat_eaten)
 	{
 		entity target_predator, target_predator_predator, oldself;
 		target_predator = self.predator;
@@ -580,7 +633,7 @@ void Vore()
 		self.digesting = FALSE;
 
 	// predator wishes to regurgitate his prey
-	if(self.BUTTON_REGURGITATE)
+	if(self.BUTTON_REGURGITATE && time > self.action_delay)
 	{
 		if(self.stomach_load)
 		{
@@ -606,21 +659,23 @@ void Vore()
 // Code that addresses the prey:
 // --------------------------------
 
+	Vore_SetPreyPositions();
+
 	// keepdeadprey - detach dead prey if their predator died or got swallowed
-	if(self.fakepredator.classname == "player")
-	if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.predator.classname == "player")
+	if(self.fakeprey)
+	if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.stat_eaten)
 		Vore_DeadPrey_Detach(self);
 
-	if(self.predator.classname != "player")
+	if(!self.stat_eaten)
 		return;
 
-	if(self.deadflag)
+	if(self.deadflag != DEAD_NO)
 	{
 		Vore_PreyRelease(self, FALSE);
 		return;
 	}
 
-	if(self.predator.deadflag)
+	if(self.predator.deadflag != DEAD_NO)
 		Vore_Regurgitate(self);
 	else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))
 		Vore_Regurgitate(self);
@@ -646,5 +701,7 @@ void Vore()
 	if(self.BUTTON_JUMP)
 		Vore_StomachLeave();
 
-	Vore_CameraEffect_Apply();
+	// Ugly workaround for a Keyhunt issue. Your team's key can still be given to you while in the stomach
+	// (at round start), which is pretty ugly and wrong. So attempt to drop keys each frame for prey
+	kh_Key_DropAll(self, FALSE);
 }
\ No newline at end of file