From 2db53898222899564f847cacc473cab0ab7f30fb Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 28 Feb 2011 02:56:08 +0200 Subject: [PATCH] Taunts for prey. Still need fixing --- data/qcsrc/server/vore.qc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 30dcec81..a637c150 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -417,15 +417,24 @@ void Vore_AutoTaunt() // predator taunts if(self.stomach_load && !Stomach_TeamMates_check(self)) { - // taunt_soundtime is set to 0 after the taunt has played, so this indicates a new start if(!self.taunt_soundtime) - { SetAutoTaunt(self, time, TRUE, TAUNTTYPE_VOREPRED); - } } else if(self.taunt_soundtype == TAUNTTYPE_VOREPRED) { - // we have a predator taunt scheduled, but we're no longer a predator, so remove it + // we have a predator taunt scheduled, but are no longer a (suitable) predator, so remove it + SetAutoTaunt(self, 0, FALSE, 0); + } + + // prey taunts + if(self.predator.classname == "player" && !(teams_matter && self.team == self.predator.team)) + { + if(!self.taunt_soundtime) + SetAutoTaunt(self, time, TRUE, TAUNTTYPE_VOREPREY); + } + else if(self.taunt_soundtype == TAUNTTYPE_VOREPREY) + { + // we have a prey taunt scheduled, but are no longer a (suitable) prey, so remove it SetAutoTaunt(self, 0, FALSE, 0); } } -- 2.39.2