Tweak how regurgitation colors are applied for prey that leaves bellies

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 95a08a98d1ca113df0690d39d6c5a40ad7cc37a7..8581592c9dbfb3e7e38fdfdf6f7a56ef54c04da2 100644 (file)
--- 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"\r
 set g_vore_gurglesound 1 "predators make an ambient gurgling sound"\r
 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)"\r
-set g_vore_regurgitatecolor_release "0.6 0.4 0" "the color players will have when regurgitated alive"\r
-set g_vore_regurgitatecolor_release_fade 0.01 "how quickly the regurgitation color washes off players once they leave the stomach"\r
-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"\r
+set g_vore_regurgitatecolor_color_normal "0.6 0.4 0" "the color players will have when regurgitated without having been digested"\r
+set g_vore_regurgitatecolor_color_digest "0.3 0.15 0" "the color players will have when regurgitated after having been digested"\r
+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"\r
 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"\r
 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"\r
 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"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index ca00c5d098c79489a0391554b768cdc60a50bdac..6c03c29774153b675d1dab57e95a9c659136e1cf 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -286,8 +286,8 @@ void Vore_Swallow(entity e)
        if(e.flagcarried)\r
                DropFlag(e.flagcarried, world, e.predator);\r
 \r
-       if(stov(cvar_string("g_vore_regurgitatecolor_release")))\r
-               e.colormod = stov(cvar_string("g_vore_regurgitatecolor_release"));\r
+       if(stov(cvar_string("g_vore_regurgitatecolor_color_normal")))\r
+               e.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_normal"));\r
 \r
        if(teams_matter && e.team == e.predator.team)\r
        {\r
@@ -508,9 +508,8 @@ void Vore_Digest()
                self.digestion_step = time + steptime;\r
        }\r
 \r
-       if(self.deadflag != DEAD_NO)\r
-       if(stov(cvar_string("g_vore_regurgitatecolor_digest")))\r
-               self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digest"));\r
+       if(stov(cvar_string("g_vore_regurgitatecolor_color_digest")))\r
+               self.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_digest"));\r
 }\r
 \r
 .float teamheal_step;\r
@@ -675,16 +674,16 @@ void Vore()
        if(self.colormod != '1 1 1')\r
        {\r
                // wash the goo away from players once they leave the stomach\r
-               if(stov(cvar_string("g_vore_regurgitatecolor_release")))\r
-               if(cvar("g_vore_regurgitatecolor_release_fade"))\r
+               if(cvar("g_vore_regurgitatecolor_fade"))\r
+               if(self.deadflag == DEAD_NO) // not for dead bodies\r
                {\r
-                       self.colormod_x += cvar("g_vore_regurgitatecolor_release_fade") * frametime;\r
+                       self.colormod_x += cvar("g_vore_regurgitatecolor_fade") * frametime;\r
                        if(self.colormod_x > 1)\r
                                self.colormod_x = 1;\r
-                       self.colormod_y += cvar("g_vore_regurgitatecolor_release_fade") * frametime;\r
+                       self.colormod_y += cvar("g_vore_regurgitatecolor_fade") * frametime;\r
                        if(self.colormod_y > 1)\r
                                self.colormod_y = 1;\r
-                       self.colormod_z += cvar("g_vore_regurgitatecolor_release_fade") * frametime;\r
+                       self.colormod_z += cvar("g_vore_regurgitatecolor_fade") * frametime;\r
                        if(self.colormod_z > 1)\r
                                self.colormod_z = 1;\r
                }\r