Ring for stomach kicking

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

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 7dd8017661d3a70b5aec4da5f932d2f35b5c0c0b..29e01cdb39923eab27214a6eded2331fe704f868 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -35,7 +35,7 @@ float Swallow_condition_check(entity prey)
        if(prey != self)\r
        if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach\r
        if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
-       if(!self.BUTTON_REGURGITATE && self.action_delay < time)\r
+       if(!self.BUTTON_REGURGITATE && time > self.action_delay)\r
        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
        {\r
                string swallow_complain;\r
@@ -434,15 +434,30 @@ void Vore_AutoTaunt()
 \r
 void Vore_SetSbarRings()\r
 {\r
-       if(self.action_delay > time)\r
+       // first clear the ring stats, then configure them if needed\r
+       self.stat_sbring1_type = self.stat_sbring1_clip = 0;\r
+       self.stat_sbring2_type = self.stat_sbring2_clip = 0;\r
+\r
+       if(self.stat_eaten)\r
        {\r
-               self.stat_sbring1_type = 1; // ring shows vore action delay\r
-               self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
+               if(time <= self.stomachkick_delay)\r
+               {\r
+                       self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress\r
+                       self.stat_sbring1_clip = bound(0, (time / self.stomachkick_delay - 1) / ((self.stomachkick_delay - cvar("g_balance_vore_kick_delay")) / self.stomachkick_delay - 1), 1);\r
+               }\r
        }\r
        else\r
        {\r
-               self.stat_sbring1_type = 0;\r
-               self.stat_sbring1_clip = 0;\r
+               if(time <= self.action_delay)\r
+               {\r
+                       self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress\r
+                       self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
+               }\r
+               if(time <= self.regurgitate_prepare)\r
+               {\r
+                       self.stat_sbring2_type = 1; // ring shows regurgitation preparing, fills with progress\r
+                       self.stat_sbring2_clip = 1 - bound(0, (time / self.regurgitate_prepare - 1) / ((self.regurgitate_prepare - cvar("g_balance_vore_regurgitate_delay")) / self.regurgitate_prepare - 1), 1);\r
+               }\r
        }\r
 }\r
 \r
@@ -573,7 +588,7 @@ void Vore()
                self.digesting = FALSE;\r
 \r
        // predator wishes to regurgitate his prey\r
-       if(self.BUTTON_REGURGITATE)\r
+       if(self.BUTTON_REGURGITATE && time > self.action_delay)\r
        {\r
                if(self.stomach_load)\r
                {\r
@@ -622,7 +637,6 @@ void Vore()
 \r
        // apply delayed regurgitating if it was scheduled\r
        if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)\r
-       if(time > self.predator.action_delay)\r
        {\r
                self.predator.regurgitate_prepare = 0;\r
                self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach\r