X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=e64eaab61b59fcf4e7fcaeb06e0145c73092f9bc;hb=248cf47b022caea9730cae1a8d13ca1dfbfe5db3;hp=6c07ac1345d4f17c6a47ad8f6b8e2222dbd1d178;hpb=12fb3835a0bec5f13b0eb1c46e7063d493452887;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 6c07ac13..e64eaab6 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -139,9 +139,14 @@ void Vore_GurgleSound()
 {
 	if(time > self.gurglesound_finished || (self.gurgle_oldstomachload != self.stomach_load && !self.digesting))
 	{
-		GlobalSound(self.playersound_gurgle, CHAN_TRIGGER, VOICETYPE_GURGLE);
+		GlobalSound(self.playersound_gurgle, CHAN_TRIGGER, VOICETYPE_GURGLE, VOL_BASE);
+
+		// yes, hard coded sound length. I know it's bad but what can I do?
+		if(cvar("g_healthsize") && cvar("g_healthsize_pitch"))
+			self.gurglesound_finished = time + 11 * pow(self.scale, -cvar("g_healthsize_pitch")); // modified sound pitch, based on player scale
+		else
+			self.gurglesound_finished = time + 11; // yes, hard coded sound length. I know it's bad but what can I do?
 
-		self.gurglesound_finished = time + 11; // yes, hard coded sound length. I know it's bad but what can I do?
 		self.gurgle_oldstomachload = self.stomach_load;
 	}
 }
@@ -152,10 +157,12 @@ void Vore_AutoDigest(entity e)
 
 	if(!cvar("g_vore_digestion") || e.digesting)
 		return;
-	if(clienttype(e) != CLIENTTYPE_REAL)
-		return; // this feature is only for players, not bots
+	if(g_rpg)
+		return; // RPG is choice based, so don't do things automatically there
 	if(e.stomach_load)
 		return; // don't start digestion if we already ate someone, as that means we manually disabled it after the first prey and want it off
+	if(clienttype(e) != CLIENTTYPE_REAL)
+		return; // this feature is only for players, not bots
 	if(Stomach_TeamMates_check(e))
 		return; // never begin automatic digestion if we've swallowed a team mate
 
@@ -202,7 +209,7 @@ void Vore_StomachLoad_Apply()
 	self.stomach_load = final_load;
 
 	// apply weight
-	self.gravity = 1 + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_weight");
+	self.gravity = 1 * (cvar("g_healthsize") ? pow(self.scale, cvar("g_healthsize_weight")) : 1) + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_weight");
 	if(!self.gravity && self.stomach_load)
 		self.gravity = 0.00001; // 0 becomes 1 for gravity, so do this to allow 0 gravity
 }
@@ -296,6 +303,9 @@ void Vore_Swallow(entity e)
 	e.solid = SOLID_NOT;
 	e.aiment = e.predator; // follow the predator, automatically unset when regurgitated
 
+	float scalediff;
+	scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the effect
+
 	// drop keys (KH) and flags (CTF) when we get swallowed
 	kh_Key_DropAll(e, FALSE);
 	if(e.flagcarried)
@@ -314,7 +324,9 @@ void Vore_Swallow(entity e)
 
 	PlayerSound(e.predator, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
-	e.predator.punchangle_x -= cvar("g_balance_vore_swallow_predator_punchangle");
+	e.predator.punchangle_x = crandom() * cvar("g_balance_vore_swallow_predator_punchangle") * scalediff;
+	e.predator.punchangle_y = crandom() * cvar("g_balance_vore_swallow_predator_punchangle") * scalediff;
+	e.predator.punchangle_z = crandom() * cvar("g_balance_vore_swallow_predator_punchangle") * scalediff;
 	e.predator.regurgitate_prepare = 0;
 	e.predator.spawnshieldtime = 0; // lose spawn shield when we vore
 	e.predator.hitsound += 1; // play this for team mates too, as we could be swallowing them to heal them
@@ -335,6 +347,10 @@ void Vore_SwallowStep(entity e)
 		return;
 	}
 
+	// when the predator starts swallowing, play his grab sound
+	if(!self.swallow_progress_pred)
+		PlayerSound(self, playersound_grab, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
+
 	Vore_SwallowModel_Update(e, self);
 
 	// increase the progress value until it reaches 1, then swallow the player
@@ -347,6 +363,17 @@ void Vore_SwallowStep(entity e)
 		if(cvar("g_balance_vore_swallow_speed_fill_stomachload") && e.stomach_load) // fill rate is influenced by the prey's stomach load
 			fill *= (1 - ((e.stomach_load / e.stomach_maxload) * bound(0, cvar("g_balance_vore_swallow_speed_fill_stomachload"), 1)));
 
+		// skill-based speed offset for bots
+		if(skill && cvar("skill_offset"))
+		{
+			float ofs;
+			ofs = pow(skill / cvar("skill_offset_center"), cvar("skill_offset"));
+			if(clienttype(self) == CLIENTTYPE_BOT)
+				fill *= ofs;
+			if(clienttype(e) == CLIENTTYPE_BOT)
+				fill /= ofs;
+		}
+
 		e.swallow_progress_prey += fill;
 	}
 	else
@@ -370,6 +397,7 @@ void Vore_Regurgitate(entity e)
 	e.punchvector_z = -cvar("g_balance_vore_regurgitate_prey_punchvector");
 
 	// if the prey has been fully digested, silently detach them
+	if(cvar("g_balance_vore_regurgitate_death_silent"))
 	if(e.deadflag != DEAD_NO && e.health <= cvar("g_balance_vore_digestion_limit"))
 	{
 		e.predator = world;
@@ -377,10 +405,13 @@ void Vore_Regurgitate(entity e)
 		return;
 	}
 
+	float scalediff;
+	scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the effect
+
 	// apply velocities
 	makevectors(e.predator.v_angle);
-	e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force");
-	e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce");
+	e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;
+	e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;
 	e.pusher = e.predator; // allows us to frag players by regurgitating them in deadly pits
 	e.pushltime = time + cvar("g_maxpushtime");
 
@@ -407,8 +438,10 @@ void Vore_Regurgitate(entity e)
 
 	PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
-	pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);
-	e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_predator_punchangle");
+	pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER));
+	e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff;
+	e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff;
+	e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff;
 	e.predator.regurgitate_prepare = 0;
 	e.predator.action_delay = time + cvar("g_balance_vore_action_delay");
 	Vore_SetPreyPositions(e.predator);
@@ -419,9 +452,10 @@ void Vore_Regurgitate(entity e)
 	e.predator = world;
 }
 
-void Vore_Disconnect()
+void Vore_Disconnect(float consumables)
 {
 	// frees prey from their predators when someone disconnects or goes spectating, or in other circumstances
+	entity e;
 
 	// prey disconnects or goes spectating while inside someone's belly
 	if(self.stat_eaten)
@@ -434,6 +468,15 @@ void Vore_Disconnect()
 		if(head.predator == self)
 			Vore_Regurgitate(head);
 	}
+	// remove consumable items when we disconnect
+	if(consumables)
+	{
+		for(e = world; (e = find(e, classname, "consumable")); )
+		{
+			if(e.predator == self)
+				Item_Consumable_Remove(e, TRUE);
+		}
+	}
 
 	self.stomach_load = self.gravity = 0; // prevents a bug
 	Vore_GurgleSound(); // stop the gurgling sound
@@ -459,13 +502,14 @@ void Vore_Digest()
 
 		damage_offset = 1;
 		if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage
-			damage_offset *= (self.predator.stomach_load / self.predator.stomach_maxload) / cvar("g_balance_vore_digestion_distribute");
+			damage_offset /= (1 - (self.predator.stomach_load / self.predator.stomach_maxload) * bound(0, cvar("g_balance_vore_digestion_distribute"), 1));
 		if(cvar("g_healthsize") && cvar("g_balance_vore_digestion_scalediff")) // apply player scale to digestion damage
 			damage_offset *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_digestion_scalediff"));
 
-		damage = cvar("g_balance_vore_digestion_damage") / damage_offset;
-		if(cvar("g_balance_vore_digestion_damage_death") && self.deadflag != DEAD_NO) // amplify digestion damage for dead prey
-			damage *= cvar("g_balance_vore_digestion_damage_death");
+		if(self.deadflag != DEAD_NO)
+			damage = cvar("g_balance_vore_digestion_damage_death") / damage_offset;
+		else
+			damage = cvar("g_balance_vore_digestion_damage") / damage_offset;
 
 		Damage(self, self.predator, self.predator, 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"))
@@ -512,27 +556,38 @@ void Vore_StomachKick()
 	if(self.deadflag != DEAD_NO)
 		return;
 
+	float scalediff;
+	scalediff = pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff"));
+
 	if(time > self.stomachkick_delay && !self.kick_pressed)
 	{
-		float damage, vol;
+		float damage, vol, pitch;
 		vector force;
 		damage = cvar("g_balance_vore_kick_damage");
 		force = v_forward * cvar("g_balance_vore_kick_force");
 		vol = VOL_BASE;
 
+		// modified sound pitch, based on player scale
+		if(cvar("g_healthsize") && cvar("g_healthsize_pitch"))
+			pitch = pow(self.predator.scale, -cvar("g_healthsize_pitch"));
+
 		// apply player scale to the damage / force of the kick
 		if(cvar("g_healthsize") && cvar("g_balance_vore_kick_scalediff"))
 		{
-			damage *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff"));
-			force *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff"));
-			vol *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff")); // kick sound volume based on the same scale
+			damage *= scalediff;
+			force *= scalediff;
+			vol *= scalediff; // kick sound volume based on the same scale
 		}
 		vol = bound(0, vol, 1);
 
 		Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, force);
-		sound(self.predator, CHAN_PROJECTILE, strcat("weapons/hit", ftos(floor(random() * 8)), ".wav"), vol, ATTN_NORM);
-		self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");
-		self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");
+		sound7(self.predator, CHAN_PROJECTILE, strcat("weapons/hit", ftos(floor(random() * 8)), ".wav"), vol, ATTN_NORM, 100 * pitch, 0);
+		self.predator.punchangle_x = crandom() * cvar("g_balance_vore_kick_predator_punchangle") * scalediff;
+		self.predator.punchangle_y = crandom() * cvar("g_balance_vore_kick_predator_punchangle") * scalediff;
+		self.predator.punchangle_z = crandom() * cvar("g_balance_vore_kick_predator_punchangle") * scalediff;
+		self.punchangle_x = crandom() * cvar("g_balance_vore_kick_prey_punchangle") * scalediff;
+		self.punchangle_y = crandom() * cvar("g_balance_vore_kick_prey_punchangle") * scalediff;
+		self.punchangle_z = crandom() * cvar("g_balance_vore_kick_prey_punchangle") * scalediff;
 
 		// abort the predator's scheduled regurgitation
 		if(random() < cvar("g_balance_vore_kick_cutregurgitate"))
@@ -674,7 +729,7 @@ void Vore()
 		if(cvar("g_vore_regurgitatecolor_particles"))
 		if(self.regurgitatecolor_particles_tick < time)
 		{
-			pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', 1);
+			pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', floor((cvar("g_healthsize") ? self.scale : 1) * PARTICLE_MULTIPLIER));
 			self.regurgitatecolor_particles_tick = time + cvar("g_vore_regurgitatecolor_particles") * vlen(self.colormod); // particle time depends on how dirty the player is
 		}
 	}
@@ -726,12 +781,12 @@ void Vore()
 	// apply delays and skip the vore system under some circumstances
 	if(!cvar("g_vore")) // the vore system is disabled
 	{
-		Vore_Disconnect();
+		Vore_Disconnect(TRUE);
 		return;
 	}
 	if(time < game_starttime || (time < warmup && !inWarmupStage)) // don't allow vore before a round begins
 	{
-		Vore_Disconnect();
+		Vore_Disconnect(FALSE);
 		return;
 	}
 	if(self.spectatee_status)
@@ -785,6 +840,7 @@ void Vore()
 
 	// predator wishes to regurgitate his prey
 	if(self.BUTTON_REGURGITATE && time > self.action_delay)
+	if(!self.regurgitate_prepare)
 	{
 		if(self.stomach_load)
 		{
@@ -857,9 +913,8 @@ void Vore()
 	// apply delayed regurgitating if it was scheduled
 	if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)
 	{
-		self.predator.regurgitate_prepare = 0;
-		self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach
 		Vore_Regurgitate(self);
+		self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach
 	}
 
 	// execute digesting and team healing