More fixes to the gurgle sound. I guess it's ready and working

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

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 5c81ee2a6aa8053ff748f78d11e3b4c43176bf3d..b43a4db22d78987f20bcc93ce1c98fed37356618 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -3,6 +3,7 @@
 .float complain_swallow;\r
 const float complain_delay = 1;\r
 const float button_delay = 0.5;\r
+const float steptime = 0.1;\r
 \r
 .float vore_oldmovetype, vore_oldsolid, vore_oldstomachload;\r
 \r
@@ -105,6 +106,18 @@ void Vore_Regurgitate(entity e)
        e.view_ofs_z *= 2; // best positioning for the stomach model\r
        e.stat_eaten = FALSE;\r
 \r
+       // velocities\r
+       local vector oldforward, oldright, oldup;\r
+       oldforward = v_forward;\r
+       oldright = v_right;\r
+       oldup = v_up;\r
+       makevectors(e.eater.v_angle);\r
+       e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force");\r
+       e.eater.velocity += -v_forward * cvar("g_balance_vore_regurgitate_eaterforce");\r
+       v_forward = oldforward;\r
+       v_right = oldright;\r
+       v_up = oldup;\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
@@ -144,7 +157,7 @@ void Vore_Disconnect()
 void Vore_Digest()\r
 {\r
        // apply digestion to prey\r
-       if(time > self.eater.digestion_step + 0.1)\r
+       if(time > self.eater.digestion_step + steptime)\r
        {\r
                Damage(self, self.eater, self.eater, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0');\r
                if(cvar("g_balance_vore_digestion_vampire") && self.eater.health < cvar("g_balance_vore_digestion_vampire_stable"))\r
@@ -163,6 +176,17 @@ void Vore_Digest()
                self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digested"));\r
 }\r
 \r
+.float teamheal_step;\r
+void Vore_Teamheal()\r
+{\r
+       if(cvar("g_balance_vore_teamheal") && self.health < cvar("g_balance_vore_teamheal_stable"))\r
+       if(time > self.teamheal_step + steptime)\r
+       {\r
+               self.health += cvar("g_balance_vore_teamheal");\r
+               self.teamheal_step = time;\r
+       }\r
+}\r
+\r
 .float stomachkick_delay;\r
 void Vore_StomachKick()\r
 {\r
@@ -190,6 +214,25 @@ void Vore_StomachKick()
        }\r
 }\r
 \r
+.float gurglesound_finished, gurglesound_oldstomachload;\r
+void Vore_Gurglesound()\r
+{\r
+       if(time > self.gurglesound_finished || self.gurglesound_oldstomachload != self.stomach_load)\r
+       {\r
+               local float vol;\r
+               vol = VOL_BASE * self.stomach_load / cvar("g_balance_vore_swallow_limit");\r
+\r
+               precache_sound("player/gurgle.ogg");\r
+               if(self.stomach_load)\r
+                       sound (self, CHAN_TRIGGER, "player/gurgle.ogg", vol, ATTN_NORM);\r
+               else\r
+                       stopsound(self, CHAN_TRIGGER);\r
+\r
+               self.gurglesound_finished = time + 11; // yes, hard coded sound length. I know it's bad but what can I do?\r
+               self.gurglesound_oldstomachload = self.stomach_load;\r
+       }\r
+}\r
+\r
 void Vore()\r
 {\r
        // skip the vore system under some circumstances\r
@@ -264,6 +307,9 @@ void Vore()
                }\r
        }\r
 \r
+       if(cvar("g_vore_gurglesound"))\r
+               Vore_Gurglesound();\r
+\r
 // --------------------------------\r
 // Code that addresses the prey:\r
 // --------------------------------\r
@@ -288,6 +334,8 @@ void Vore()
 \r
        if(self.eater.digesting == TRUE)\r
                Vore_Digest();\r
+       if(teams_matter && self.team == self.eater.team)\r
+               Vore_Teamheal();\r
 \r
        Vore_StomachKick();\r
 }
\ No newline at end of file