From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 31 Jul 2011 13:20:08 +0000 (+0300)
Subject: Tweak how regurgitation colors are applied for prey that leaves bellies
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8365a7bd7eae9516ceae065e362283546813387;p=voretournament%2Fvoretournament.git

Tweak how regurgitation colors are applied for prey that leaves bellies
---

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 95a08a98..8581592c 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1598,9 +1598,9 @@ set g_vore_biggersize 0 "when enabled, a player can't swallow someone larger tha
 set g_vore_showhealth 1 "when enabled, a predator can see their prey's health on the stomach board, and prey can see the health of players he's joining in the stomach"
 set g_vore_gurglesound 1 "predators make an ambient gurgling sound"
 set g_vore_soundocclusion 0.25 "directional player sounds are cut to this amount of their initial volume for eaten players (simulates hearing harder from the stomach)"
-set g_vore_regurgitatecolor_release "0.6 0.4 0" "the color players will have when regurgitated alive"
-set g_vore_regurgitatecolor_release_fade 0.01 "how quickly the regurgitation color washes off players once they leave the stomach"
-set g_vore_regurgitatecolor_digest "0.3 0.15 0" "the color players will have when digested, only works when g_vore_keepdeadprey is disabled"
+set g_vore_regurgitatecolor_color_normal "0.6 0.4 0" "the color players will have when regurgitated without having been digested"
+set g_vore_regurgitatecolor_color_digest "0.3 0.15 0" "the color players will have when regurgitated after having been digested"
+set g_vore_regurgitatecolor_fade 0.01 "how quickly the regurgitation color washes off players once they leave the stomach, does not apply to dead bodies"
 set g_vore_regurgitatecolor_particles 0.75 "players who are dirty from regurgitation generate particles this often, based on the amount of goo they have on them"
 set g_vore_keepdeadprey 0.75 "If enabled, prey remains in the stomach after dying, else the predator throws up their dead body. 0 = disabled, 1 = ernabled, anything between = probability"
 set g_vore_neighborprey_distance 8 "Distance by which prey inside the same stomach are positioned away from each other. 0 disables seeing neighboring prey"
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index ca00c5d0..6c03c297 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -286,8 +286,8 @@ void Vore_Swallow(entity e)
 	if(e.flagcarried)
 		DropFlag(e.flagcarried, world, e.predator);
 
-	if(stov(cvar_string("g_vore_regurgitatecolor_release")))
-		e.colormod = stov(cvar_string("g_vore_regurgitatecolor_release"));
+	if(stov(cvar_string("g_vore_regurgitatecolor_color_normal")))
+		e.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_normal"));
 
 	if(teams_matter && e.team == e.predator.team)
 	{
@@ -508,9 +508,8 @@ void Vore_Digest()
 		self.digestion_step = time + steptime;
 	}
 
-	if(self.deadflag != DEAD_NO)
-	if(stov(cvar_string("g_vore_regurgitatecolor_digest")))
-		self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digest"));
+	if(stov(cvar_string("g_vore_regurgitatecolor_color_digest")))
+		self.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_digest"));
 }
 
 .float teamheal_step;
@@ -675,16 +674,16 @@ void Vore()
 	if(self.colormod != '1 1 1')
 	{
 		// wash the goo away from players once they leave the stomach
-		if(stov(cvar_string("g_vore_regurgitatecolor_release")))
-		if(cvar("g_vore_regurgitatecolor_release_fade"))
+		if(cvar("g_vore_regurgitatecolor_fade"))
+		if(self.deadflag == DEAD_NO) // not for dead bodies
 		{
-			self.colormod_x += cvar("g_vore_regurgitatecolor_release_fade") * frametime;
+			self.colormod_x += cvar("g_vore_regurgitatecolor_fade") * frametime;
 			if(self.colormod_x > 1)
 				self.colormod_x = 1;
-			self.colormod_y += cvar("g_vore_regurgitatecolor_release_fade") * frametime;
+			self.colormod_y += cvar("g_vore_regurgitatecolor_fade") * frametime;
 			if(self.colormod_y > 1)
 				self.colormod_y = 1;
-			self.colormod_z += cvar("g_vore_regurgitatecolor_release_fade") * frametime;
+			self.colormod_z += cvar("g_vore_regurgitatecolor_fade") * frametime;
 			if(self.colormod_z > 1)
 				self.colormod_z = 1;
 		}