Better balancing with the new taunts.

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 3ab5cb93be5fb39703cb777571ff019c0dfc2a2b..aece24ec39eb079ce1f18e94ae26ff3889ef3c78 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -206,9 +206,9 @@ seta vid_x11_display ""     "voretournament-linux-*.sh will use this to start voreto
 cl_autodemo_nameformat demos/%Y-%m-%d_%H-%M\r
 \r
 // taunts and voices\r
 cl_autodemo_nameformat demos/%Y-%m-%d_%H-%M\r
 \r
 // taunts and voices\r

-seta cl_autotaunt 0.75 "automatically taunt enemies when fragging them"\r
-seta sv_vore_autotaunt_repeat_min 2.5 "how many seconds to attempt playing vore taunts, minimum"\r
-seta sv_vore_autotaunt_repeat_max 10 "how many seconds to attempt playing vore taunts, maximum"\r
+seta cl_autotaunt 0.65 "automatically taunt enemies when fragging them"\r
+seta sv_vore_autotaunt_repeat_min 0.5 "how many seconds to attempt playing vore taunts, minimum"\r
+seta sv_vore_autotaunt_repeat_max 2 "how many seconds to attempt playing vore taunts, maximum"\r

 seta sv_taunt 1 "allow taunts on the server"\r
 seta sv_autotaunt 1 "allow autotaunts on the server"\r
 seta cl_voice_directional 1    "0 = all voices are non-directional, 1 = all voices are directional, 2 = only taunts are directional"\r
 seta sv_taunt 1 "allow taunts on the server"\r
 seta sv_autotaunt 1 "allow autotaunts on the server"\r
 seta cl_voice_directional 1    "0 = all voices are non-directional, 1 = all voices are directional, 2 = only taunts are directional"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index c806b2fd85dff9e726f5f249ebd35a7559d6d394..ae066df94c19120f4d181323e7204d363d1bdd71 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -419,7 +419,7 @@ void Vore_AutoTaunt()
        // predator taunts\r
        if(self.stomach_load && !Stomach_TeamMates_check(self))\r
        {\r
        // predator taunts\r
        if(self.stomach_load && !Stomach_TeamMates_check(self))\r
        {\r

-               if(!self.taunt_soundtime)\r
+               if(!self.taunt_soundtime) // taunt_soundtime becomes 0 once the taunt has played\r

                {\r
                        taunt_time = random() * (cvar("sv_vore_autotaunt_repeat_max") - cvar("sv_vore_autotaunt_repeat_min")) + cvar("sv_vore_autotaunt_repeat_min");\r
                        SetAutoTaunt(self, time + taunt_time, TAUNTTYPE_VOREPRED);\r
                {\r
                        taunt_time = random() * (cvar("sv_vore_autotaunt_repeat_max") - cvar("sv_vore_autotaunt_repeat_min")) + cvar("sv_vore_autotaunt_repeat_min");\r
                        SetAutoTaunt(self, time + taunt_time, TAUNTTYPE_VOREPRED);\r


@@ -434,7 +434,7 @@ void Vore_AutoTaunt()
        // prey taunts\r
        if(self.predator.classname == "player" && !(teams_matter && self.team == self.predator.team))\r
        {\r
        // prey taunts\r
        if(self.predator.classname == "player" && !(teams_matter && self.team == self.predator.team))\r
        {\r

-               if(!self.taunt_soundtime)\r
+               if(!self.taunt_soundtime) // taunt_soundtime becomes 0 once the taunt has played\r

                {\r
                        taunt_time = random() * (cvar("sv_vore_autotaunt_repeat_max") - cvar("sv_vore_autotaunt_repeat_min")) + cvar("sv_vore_autotaunt_repeat_min");\r
                        SetAutoTaunt(self, time + taunt_time, TAUNTTYPE_VOREPREY);\r
                {\r
                        taunt_time = random() * (cvar("sv_vore_autotaunt_repeat_max") - cvar("sv_vore_autotaunt_repeat_min")) + cvar("sv_vore_autotaunt_repeat_min");\r
                        SetAutoTaunt(self, time + taunt_time, TAUNTTYPE_VOREPREY);\r