Re-arrange some code in the meantime

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

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 4dff84a1d3850fb5e74e51fed25cc49bf33ff4c3..0c45de6a96991c8dca127a3e9dc117b45aa10ed0 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -97,6 +97,8 @@ void Vore_Weight_apply(entity e)
        e.vore_oldstomachload = e.stomach_load;\r
 }\r
 \r
+.entity pusher;\r
+.float pushltime;\r
 void Vore_Swallow(entity e)\r
 {\r
        // this player is beening swallowed by another player, apply the proper changes\r
@@ -104,6 +106,7 @@ void Vore_Swallow(entity e)
        e.vore_oldsolid = e.solid;\r
        e.vore_oldview_ofs_z = e.view_ofs_z;\r
 \r
+       e.eater = self;\r
        setorigin(e, e.eater.origin);\r
        e.velocity = '0 0 0';\r
        e.movetype = MOVETYPE_FOLLOW;\r
@@ -111,22 +114,28 @@ void Vore_Swallow(entity e)
        e.alpha = -1; // best way of hiding / showing the eaten player\r
        e.aiment = e.eater; // follow the predator. Is automatically unset\r
 \r
-       Vore_CameraEffect_Set(e);\r
-\r
        // drop keys (KH) and flags (CTF) when we get swallowed\r
        kh_Key_DropAll(e, FALSE);\r
        if(e.flagcarried)\r
                DropFlag(e.flagcarried, world, e.eater);\r
 \r
+       Vore_CameraEffect_Set(e);\r
+\r
        if(stov(cvar_string("g_vore_regurgitatecolor_released")))\r
                e.colormod = stov(cvar_string("g_vore_regurgitatecolor_released"));\r
 \r
+       if(e.eater.team == e.team && teamplay)\r
+               centerprint(e.eater, "^4You have swallowed a team mate, use caution!");\r
+\r
        PlayerSound(e.eater, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
        setanim(e.eater, e.eater.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        e.eater.stomach_load += 1;\r
        e.eater.regurgitate_prepare = 0;\r
        Vore_Weight_apply(e.eater);\r
 \r
+       // block firing for a small amount of time when voring, or we'll be firing the next frame after we swallow\r
+       e.eater.weapon_delay = time + button_delay;\r
+       e.eater.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
        e.system_delay = e.eater.system_delay = time + system_delay_time;\r
 }\r
 \r
@@ -151,6 +160,9 @@ void Vore_Regurgitate(entity e)
        v_right = oldright;\r
        v_up = oldup;\r
 \r
+       e.pusher = e.eater; // so we can frag players by regurgitating them in deadly pits\r
+       e.pushltime = time + cvar("g_maxpushtime");\r
+\r
        PlayerSound(e.eater, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
        setanim(e.eater, e.eater.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        pointparticles(particleeffectnum("regurgitate"), e.eater.origin, '0 0 0', 1);\r
@@ -294,17 +306,7 @@ void Vore()
        // attempt to swallow our new prey if there's any in range\r
        if(self.BUTTON_ATCK && !self.BUTTON_REGURGITATE && self.swallow_delay < time)\r
        if(Swallow_condition_check(prey))\r
-       {\r
-               prey.eater = self;\r
                Vore_Swallow(prey);\r
-               self.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
-\r
-               if(self.team == prey.team && teamplay)\r
-                       centerprint(self, "You have swallowed a team mate, use caution!");\r
-\r
-               // block firing for a small amount of time when voring, or we'll be firing the next frame after we swallow\r
-               self.weapon_delay = time + 0.25;\r
-       }\r
 \r
        // start / stop digestion on command, if the player has someone in their stomach\r
        if(self.BUTTON_DIGEST)\r
@@ -335,7 +337,7 @@ void Vore()
                        if(time > self.regurgitate_button_delay)\r
                        {\r
                                self.regurgitate_prepare = time + cvar("g_balance_vore_regurgitate_delay");\r
-                               PlayerSound(self, playersound_regurgitate_prepare, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+                               PlayerSound(self, playersound_regurgitate_prepare, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
                                self.regurgitate_button_delay = time + button_delay;\r
                        }\r
                }\r
@@ -360,7 +362,20 @@ void Vore()
        if(self.eater.deadflag || self.deadflag)\r
                Vore_Regurgitate(self);\r
        else if(self.eater.eater.classname == "player") // don't allow a player inside a player inside another player :)\r
+       {\r
+               entity targeteater, oldself;\r
+               targeteater = self.eater.eater;\r
+\r
                Vore_Regurgitate(self);\r
+               if(random() < cvar("g_vore_stealprey"))\r
+               if(Swallow_condition_check(self))\r
+               {\r
+                       oldself = self;\r
+                       self = targeteater;\r
+                       Vore_Swallow(oldself);\r
+                       self = oldself;\r
+               }\r
+       }\r
        else if(vlen(self.eater.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))\r
                Vore_Regurgitate(self);\r
 \r