]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Do it properly
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 7 Sep 2010 00:58:50 +0000 (03:58 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 7 Sep 2010 00:58:50 +0000 (03:58 +0300)
data/qcsrc/server/bot/havocbot/vore_ai.qc

index 562b6c741bfdaf0cc58d8690ba7d776d750d962a..6676c88160c716eaaf764982b1a3b5ef63ffe578 100644 (file)
@@ -19,7 +19,7 @@ float Swallow_condition_check_bot(entity prey)
        if(self.eater.classname != "player" && self.stomach_load < cvar("g_balance_vore_swallow_limit") && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves
        if not(cvar("g_vore_biggergut") && prey.stomach_load > self.stomach_load)
        if(self.health > cvar("g_balance_vore_kick_damage_max")) // explained below
-       if not(prey.team == self.team && teamplay)
+       if not(teamplay && prey.team == self.team)
                return TRUE;
        return FALSE;
 }
@@ -96,7 +96,7 @@ void Vore_AI()
        {
                // the higher the skill, the more the bot will kick in your stomack
                if(skill >= random_try)
-               if not(teams_matter && self.team == self.eater.team) // if someone from the same team somehow made it in the belly, don't kick the eater
+               if not(teamplay && prey.team == self.team) // if someone from the same team somehow made it in the belly, don't kick the eater
                        self.BUTTON_ATCK = TRUE; // kick
 
                self.decide_delay2 = time + decide_prey; // time before the bot decides what to do with their predator