Sbar ring for regurgitation delay

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

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 23fdeb77cc62090550ac7f709eb1ed7da5a63666..a0a0a245a3dbe0bced72150a1e96f7bcc40d0082 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -1,5 +1,5 @@
 .float regurgitate_prepare;\r
-.float system_delay, swallow_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
+.float stomachkick_delay, system_delay, action_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
 .float complain_vore;\r
 .float vore_oldmovetype, vore_oldsolid, vore_oldstomachload;\r
 \r
@@ -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.swallow_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
@@ -194,8 +194,9 @@ void Vore_Swallow(entity e)
 \r
        // block firing for a small amount of time, or we'll be firing the next frame after we swallow\r
        e.predator.weapon_delay = time + button_delay_time;\r
-       e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
+       e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
        e.system_delay = e.predator.system_delay = time + system_delay_time;\r
+       e.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); // don't kick immediately after being swallowed\r
 }\r
 \r
 void Vore_Regurgitate(entity e)\r
@@ -228,7 +229,7 @@ void Vore_Regurgitate(entity e)
        e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
        e.predator.stomach_load -= 1;\r
        e.predator.regurgitate_prepare = 0;\r
-       e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
+       e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
        Vore_WeightApply(e.predator);\r
 \r
        // block firing for a small amount of time, or we'll be firing the next frame\r
@@ -271,6 +272,7 @@ void Vore_DeadPrey_Detach(entity e)
 \r
        e.fakepredator = world;\r
        e.fakeprey = TRUE; // keep fakeprey status\r
+       e.stat_eaten = 0;\r
        e.aiment = world;\r
        e.movetype = MOVETYPE_TOSS;\r
 }\r
@@ -284,7 +286,7 @@ void Vore_PreyRelease(entity e, float pred_disconnect)
                else\r
                        Vore_Regurgitate(e);\r
        }\r
-       else\r
+       else if(self.stat_eaten && !self.fakeprey)\r
        {\r
                // if the keepdeadprey feature is on, don't spit a dead prey's carcass out\r
                if(e.deadflag != DEAD_NO && random() < cvar("g_vore_keepdeadprey"))\r
@@ -358,7 +360,6 @@ void Vore_Teamheal()
        }\r
 }\r
 \r
-.float stomachkick_delay;\r
 void Vore_StomachKick()\r
 {\r
        // allows prey to kick the predator's stomach and do some damage or attempt to escape\r
@@ -431,6 +432,25 @@ void Vore_AutoTaunt()
        }\r
 }\r
 \r
+void Vore_SetSbarRings()\r
+{\r
+       // first set the ring stats to 0, 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(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
+\r
+       if(time <= self.regurgitate_prepare)\r
+       {\r
+               self.stat_sbring2_type = 1; // ring shows regurgitation delay, 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
 void Vore()\r
 {\r
        // main vore code, this is where it all happens\r
@@ -461,6 +481,7 @@ void Vore()
        }\r
 \r
        // set all vore stats\r
+       Vore_SetSbarRings();\r
        if(self.fakepredator.classname == "player")\r
                self.stat_eaten = num_for_edict(self.fakepredator);\r
        else if(self.predator.classname == "player")\r
@@ -557,7 +578,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