Implement full digest feature. When enabled, the pred doesn't spit the prey's dead...

[voretournament/voretournament.git] / data / qcsrc / server / vore.qc

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 1b76d469f398e7b8cd2bcc745579a9e5fcacd414..70bdd8632066b3703a96bd2b349771be62dffd77 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -227,13 +227,68 @@ void Vore_Regurgitate(entity e)
        e.predator = world;\r
 }\r
 \r
+void Vore_DeadPrey_Configure(entity e)\r
+{\r
+       // ran when the fulldigest feature is enabled and prey stays inside the stomach after dying\r
+\r
+       if(e.fakepredator.classname == "player")\r
+               return;\r
+\r
+       // this entity is pretty much like e.predator but for dead prey, to avoid some conflicts\r
+       e.fakepredator = e.predator;\r
+\r
+       // first release the prey from the predator, as dead prey needs to be attached to predators differently\r
+       // the predator's stomach load is also decreased, as our dead prey doesn't count as actual prey any more\r
+       e.predator.stomach_load -= 1;\r
+       Vore_Weight_apply(e.predator);\r
+       e.predator = world;\r
+\r
+       // now, keep our dead prey inside the predator's stomach\r
+       e.movetype = MOVETYPE_FOLLOW;\r
+       e.aiment = e.fakepredator;\r
+       e.alpha = -1;\r
+}\r
+\r
+void Vore_DeadPrey_Detach(entity e)\r
+{\r
+       // ran when dead prey must be detached from the stomach (eg: they are respawning)\r
+\r
+       if(e.fakepredator.classname != "player")\r
+               return;\r
+\r
+       e.movetype = e.vore_oldmovetype;\r
+       e.view_ofs_z = PL_VIEW_OFS_z;\r
+       e.alpha = default_player_alpha;\r
+\r
+       // if we disconnect dead prey from the predator, gib it's body\r
+       if(e.health <= 0)\r
+               e.health = -1000;\r
+\r
+       e.fakepredator = world;\r
+}\r
+\r
+void Vore_ChoosePreyRelease(entity e)\r
+{\r
+       // if the fulldigest feature is on, we don't spit a dead prey's carcass out\r
+       if(e.health <= 0 && cvar("g_vore_fulldigest"))\r
+       {\r
+               Vore_DeadPrey_Configure(e);\r
+\r
+               // if the predator's dead, we detach the dead prey from him\r
+               if(e.fakepredator.deadflag != DEAD_NO)\r
+                       Vore_DeadPrey_Detach(e);\r
+       }\r
+       else\r
+               Vore_Regurgitate(e);\r
+}\r
+\r
 void Vore_Disconnect()\r
 {\r
        // frees prey from their predators when someone disconnects or goes spectating, or in other circumstances\r
 \r
        // prey disconnects or goes spectating while inside someone's belly\r
        if(self.predator.classname == "player")\r
-               Vore_Regurgitate(self);\r
+               Vore_ChoosePreyRelease(self);\r
 \r
        // pred disconnects or goes spectating with players in their belly\r
        else if(self.stomach_load > 0)\r
@@ -242,7 +297,7 @@ void Vore_Disconnect()
                FOR_EACH_PLAYER(head)\r
                {\r
                        if(head.predator == self)\r
-                               Vore_Regurgitate(head);\r
+                               Vore_ChoosePreyRelease(head);\r
                }\r
                Vore_Gurglesound(); // stop the gurgling sound\r
        }\r
@@ -457,10 +512,14 @@ void Vore()
 // Code that addresses the prey:\r
 // --------------------------------\r
 \r
+       if(self.deadflag)\r
+       {\r
+               Vore_ChoosePreyRelease(self);\r
+               return;\r
+       }\r
        if(self.predator.classname != "player")\r
                return;\r
-\r
-       if(self.deadflag || self.predator.deadflag)\r
+       if(self.predator.deadflag)\r
                Vore_Regurgitate(self);\r
        else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
                Vore_Regurgitate(self);\r